Merge branch 'MDL-44270' of git://github.com/jonof/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 21 Apr 2014 21:18:20 +0000 (09:18 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 21 Apr 2014 21:18:20 +0000 (09:18 +1200)
commite237b23ebf320592a8142fe7ea4c6de5ffa1eea9
tree213b4d0e57e9835dcf37b269070e08246022d669
parentc6d1088db0e09b4bc53743123d7acd841db454b2
parent6b2b72d6f9f838ebe3ae6f28c0ecd877e39ddbd4
Merge branch 'MDL-44270' of git://github.com/jonof/moodle