Merge branch '42277-26' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 23 Oct 2013 05:18:45 +0000 (13:18 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 23 Oct 2013 05:18:45 +0000 (13:18 +0800)
commit8c8a844f2bb5dfcde1e84ab7526a60d1e1455256
treeab27af564cb082f6bee008efcbd85aa22ede2605
parentd0041fb110201d3dc1a4546eca8b6108b440d1c5
parent3f08254ff8c0239c39435a49e9766082d794dcf3
Merge branch '42277-26' of git://github.com/samhemelryk/moodle