Merge branch 'wip-mdl-46327' of git://github.com/rajeshtaneja/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 19 Aug 2014 09:28:55 +0000 (17:28 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 19 Aug 2014 09:28:55 +0000 (17:28 +0800)
commit376a6f687cbd244282b443f127d4dbfae8b146e6
tree0db45de9cee652fd2469337872894df0ffe82ee5
parent52ed065131b8d4b00ce48d3776ae8fe9c9ee4863
parenta9950b49c4477491fb3ba525e734beb195e228e7
Merge branch 'wip-mdl-46327' of git://github.com/rajeshtaneja/moodle