Merge branch 'MDL-34586-master' of https://github.com/mackensen/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 14 Oct 2013 06:29:52 +0000 (14:29 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 14 Oct 2013 06:29:52 +0000 (14:29 +0800)
commit48947db1143c6859a1d966e76e4c802449b7c3ed
tree042349d5d38ef538fe02ed8496b790bb35690563
parent7bed57ae1f35d5d9a692722d1755b92a007b1122
parent68e0759c944678a826f9eec957ef754ba0c21c92
Merge branch 'MDL-34586-master' of https://github.com/mackensen/moodle