Merge branch 'MDL-29904-master' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 23 Nov 2011 00:54:26 +0000 (13:54 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 23 Nov 2011 00:54:26 +0000 (13:54 +1300)
commitba54648b45b44f2f685d124dadddb714d35b523a
treee81a3fb23d4bdda66b4d1b071ff1f788725ae837
parent0f6cc7a7cc2bb6a140e313b2eae4648913d7c6dd
parent98dd8e72e942328bdd595794b90fcaf3b9850e8e
Merge branch 'MDL-29904-master' of git://github.com/lazydaisy/moodle