Merge branch 'MDL-47200-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 07:35:19 +0000 (08:35 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 07:35:19 +0000 (08:35 +0100)
commit216b6aa7ee325904e44572f6a001b37745403ffd
treeb809616e79813bd1ff63ce494da77b3324aa7801
parent53e9b39b1869461e14d7190df359a2920323cf22
parentfeae0f9f42325c3847fc748054995eae28bb714e
Merge branch 'MDL-47200-master' of git://github.com/jleyva/moodle

Conflicts:
version.php
version.php