Merge branch 'MDL-34437-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 9 Dec 2014 02:58:46 +0000 (15:58 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 9 Dec 2014 02:58:46 +0000 (15:58 +1300)
commit54907a6a9b05ca777e958f50cf6957d346c71d02
tree0d0a91899e7f806816c56410ef390d004bb6ca74
parentd5265ac28eb394749cdae53dbc84fc33c6a61eaa
parent9318de17ef86f08781b2b81473d85a5919582f91
Merge branch 'MDL-34437-master' of git://github.com/ankitagarwal/moodle