Merge branch 'MDL-43105-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
commit1abaa0c22ea32311ade9afe818f7e6ab7ca5da9b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 18:16:08 +0000 (3 19:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 18:16:08 +0000 (3 19:16 +0100)
treea632bd46f0ba8cd576b8cd880d66616bd1f3786e
parent9a734d1862445a1c82803a3095788f139e2d6d69
parent6dae8225432d7acbaa440355a5cbb268be9c0275
Merge branch 'MDL-43105-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE