Merge branch 'MDL-37806-workshop-next' of git://github.com/mudrd8mz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 4 Feb 2013 04:48:42 +0000 (12:48 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 4 Feb 2013 04:48:42 +0000 (12:48 +0800)
commitc15cda6138926dec48a8cb325792af8dcfa4f910
treec372660c5c0e5a7128dee10d23c27c514e9f5d67
parentd5a13bca0959935c178b9a28c6e3f2f224c3ae1e
parent1df3bc143c9f8c2706a7127e18d5f34548ff6805
Merge branch 'MDL-37806-workshop-next' of git://github.com/mudrd8mz/moodle