Merge branch 'MDL-30175' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Nov 2011 21:57:54 +0000 (10:57 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Nov 2011 21:57:54 +0000 (10:57 +1300)
commitdaa1ed26cfe4d6f6760af1dfb8b5ba9d2216c61a
tree622c84300307a410a6e63551c7828440988d7bcb
parentefe41e35c9869e7ff279db69ca8a712112583d7d
parentc443a1cdb684ae3045d652324e88a722120de52b
Merge branch 'MDL-30175' of git://github.com/stronk7/moodle