Merge branch 'MDL-47713-master-fix1' of http://github.com/damyon/moodle
commitea4361b3a551cb6b21a98a89c3c5fc3d3a96f613
authorDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 07:18:31 +0000 (23 08:18 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:02 +0000 (24 11:48 +0200)
treedd2b82bb95edc7bbad75c592ce9c64bc729ee1f2
parentbdb319a5b13074ecc6e430032d29814ec53bd74c
parenta7c37934cc5a07b2992b9077913cd536a6e14f62
Merge branch 'MDL-47713-master-fix1' of github.com/damyon/moodle