Merge branch 'MDL-47225-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 16 Sep 2014 07:15:57 +0000 (15:15 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 16 Sep 2014 07:15:57 +0000 (15:15 +0800)
commitac7fac558ee0e4ef12eacc9200a7512573cdda1c
treedefc9b12148fc39c544a940e0f275d499c39b45e
parentffd9e5d2699f41d4d42e03f62aa9cb86accebab9
parent96671c8c38c5586797fe86e8f76c5182f33c3f88
Merge branch 'MDL-47225-master' of git://github.com/andrewnicols/moodle