Merge branch 'MDL-46620-27' of https://github.com/merrill-oakland/moodle into MOODLE_...
commitc1ee5cf31b3ab1cfceae29a0df6e620ca98a9134
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 3 Aug 2014 18:01:44 +0000 (3 20:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 3 Aug 2014 18:01:44 +0000 (3 20:01 +0200)
tree2995cb95f3523998c95f455813b3b495c46e0a5a
parent6b7a5f86a05f449692a9342b851f508603206c17
parentddb652c7064fc298e93351a04acaea54956f9a51
Merge branch 'MDL-46620-27' of https://github.com/merrill-oakland/moodle into MOODLE_27_STABLE