Merge branch 'MDL-48171-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Nov 2014 00:21:02 +0000 (13:21 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Nov 2014 00:21:02 +0000 (13:21 +1300)
commit993e61d97004a71507c3bcf5b478b6f8bc53a628
tree8d904e5226e4cce9f4fd6b15478249e67746b976
parent0d23255b89d4791300802faa4cf48a576b14a1a0
parent74b28381c61288a15e0dafa12778a03e25d41386
Merge branch 'MDL-48171-master' of git://github.com/ankitagarwal/moodle