Merge branch 'MDL-5583-master' of git://github.com/xow/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 02:02:23 +0000 (10:02 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 02:02:23 +0000 (10:02 +0800)
commit039b74fd018e28edccb42c69a779878339f6839e
tree877aacd5c702fa68792de55aba1057e9ce968e8f
parentf966af0da3c9f4011db400fe69a53009dbee1e0a
parent1c3b2058c8f82f63906c97b1a33ecf589fa7f320
Merge branch 'MDL-5583-master' of git://github.com/xow/moodle