Merge branch 'MDL-43723-master-nomerge2' of git://github.com/mouneyrac/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 25 Feb 2014 08:43:56 +0000 (16:43 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 25 Feb 2014 08:43:56 +0000 (16:43 +0800)
commit58ff6e51df1c3f74ca282e68f256db1134a2a40d
treebd3ba934fc3c9e3a684331f2b7a9f3cb40f1ce67
parentd4c01301ec3ed9624e39bf75cce4ec93e54733a5
parentd14f5265b2db9883962d225dca51289223440244
Merge branch 'MDL-43723-master-nomerge2' of git://github.com/mouneyrac/moodle