Merge branch 'MDL-29478' of git://github.com/stronk7/moodle
commit0ebe6764e9666cbd5dd8732eef6ed1b10cd8e2ce
authorSam Hemelryk <sam@moodle.com>
Sun, 25 Sep 2011 21:52:48 +0000 (26 10:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 Sep 2011 21:52:48 +0000 (26 10:52 +1300)
tree0ffa4682d99716487b3746150cbd85d090b80923
parentfea98bd4c37b3641a417f5dbda6b126ef25930df
parente437d9f1d9883fa4ea3929ba43060faccedd26f9
Merge branch 'MDL-29478' of git://github.com/stronk7/moodle