Merge branch 'test-48374' of git://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Dec 2014 01:57:24 +0000 (02:57 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 12:14:30 +0000 (12:14 +0000)
commiteb9419c8e2b0c1f2b9dbfe1fc995d37157dc73d6
tree4666106e1becdce0fc4f976a816a2987924239a2
parentf889c45159b595e9d65e089894fb4927f4e47df0
parent9f3a68fe612076b130c6216bc8549bb427f5f981
Merge branch 'test-48374' of git://github.com/rajeshtaneja/moodle