Merge branch 'MDL-44980-master-v2' of git://github.com/jamiepratt/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 11 Apr 2014 04:55:15 +0000 (12:55 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 11 Apr 2014 04:55:15 +0000 (12:55 +0800)
commitd6a756a949a99910943f7528f0ac47ceafbb0b83
tree8d540283ee33a12f34d966d591ac43ef07ece62d
parent8a69b046e5524b904bcd1b39ad02e1fdef79b2b9
parentbec7719c3ba4f6c5f796e7184bdb1b63c3c7c0b9
Merge branch 'MDL-44980-master-v2' of git://github.com/jamiepratt/moodle