Merge branch 'MDL-48595_master' of git://github.com/dmonllao/moodle
commit675549863799f3416386c5ff6a00bbd143c3efab
authorDan Poltawski <dan@moodle.com>
Tue, 10 Mar 2015 09:59:28 +0000 (10 09:59 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Mar 2015 09:59:28 +0000 (10 09:59 +0000)
treea83379c004465209cc9d940ff3c13374ea5a43a0
parentceba96bbca9d02bcd3d7ece895352b097e11fdb1
parent59aebbed70f51351abe7d9119ae5f3c801fc6714
Merge branch 'MDL-48595_master' of git://github.com/dmonllao/moodle

Conflicts:
version.php
version.php