Merge branch 'MDL-27764' of git://github.com/stronk7/moodle
commitcb0a0690191e61a7a1c9be548d22ef2fe6824a5f
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 21:19:28 +0000 (6 10:19 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 21:19:28 +0000 (6 10:19 +1300)
tree7cdbf524f7a45f9f8dbf40b45e19c53587f38e73
parent22e5ef529d368b2e64f869a5356aeb3ae453032f
parentb904130b5b815988b0dbadc70934941a1abd3175
Merge branch 'MDL-27764' of git://github.com/stronk7/moodle