Merge branch 'MDL-38435-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 18 Mar 2013 05:08:41 +0000 (13:08 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 18 Mar 2013 05:08:41 +0000 (13:08 +0800)
commit61e871c3c977d3afbbe45ed8936760a90c7c593b
tree93adfc7e0361874452ddea47cce04dbd6616874d
parent1ef6160aded8babccd796a187965dff4624ca313
parentf160f97c12e8a03bea8154a86b892146c44d49fb
Merge branch 'MDL-38435-master' of git://github.com/FMCorz/moodle