Merge branch 'MDL-20367-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 09:41:58 +0000 (10:41 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 09:41:58 +0000 (10:41 +0100)
commit7ea782ab3c9c2f7ee22c50850e7c52f8172b4b3e
tree95631c38f1cd50c6f833146005813cc4c9786568
parentec007900c0469e1c4de5230f15cb284f7eaac789
parenta9a02e9170fda0b9913527cf710b421326fa50aa
Merge branch 'MDL-20367-master' of git://github.com/damyon/moodle