Merge branch 'MDL-49316-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 07:50:13 +0000 (15:50 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 07:50:13 +0000 (15:50 +0800)
commitfa91462dfa058b3cd2d1ddacbcad7afc6aba616c
tree718f1cf1c7dc6f6e6406dc91dca6054de31bd5b3
parent81ce169dce4c4640db7a41ac2cabfb1813878020
parent31c202b0abc86c914c50c4dd5e8b9307c7dabb74
Merge branch 'MDL-49316-master' of git://github.com/jleyva/moodle

Conflicts:
version.php
version.php