Merge branch 'wip-MDL-31147-master' of git://github.com/phalacee/moodle
commit86e62f92231d5148c45405076d605e3888e46524
authorSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 23:50:17 +0000 (9 11:50 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 23:50:17 +0000 (9 11:50 +1200)
tree307c9f689a989c20d541ba1301ae50528024e5d7
parent303cb36b183db65c1911319f08749ff00f2df834
parent58cc51ee1568f4d948a74b136ffdce55d465e671
Merge branch 'wip-MDL-31147-master' of git://github.com/phalacee/moodle