Merge branch 'MDL-43595-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 8 Jan 2014 03:34:46 +0000 (11:34 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 8 Jan 2014 03:34:46 +0000 (11:34 +0800)
commita6fa74bca396de5e1c80fb3e61b103b12fb24b54
tree2e9e9ed015d8052e83c87eceaddbe6e3ab0a0798
parentab7f49834334cac00f272ba8069693753ca2674c
parentcf1110eb62a3e0e5c5699ae60bf1ad6a9e951df1
Merge branch 'MDL-43595-master' of git://github.com/damyon/moodle