Merge branch 'MDL-38172' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Oct 2014 17:28:44 +0000 (18:28 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Oct 2014 17:28:44 +0000 (18:28 +0100)
commit96b12233877656116073c834b1de7947ded7cd05
treea8ea5d48f719bbe04767b1525c821e266c5167b6
parent83b49754d32dc4720730c2609ce873186dab4aa3
parent28928667a06295afb6ca18a6b199e5d48b5ab86a
Merge branch 'MDL-38172' of git://github.com/jmvedrine/moodle