Merge branch 'MDL-29139' of git://github.com/nebgor/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 25 Sep 2011 21:46:39 +0000 (10:46 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 Sep 2011 21:46:39 +0000 (10:46 +1300)
commitfea98bd4c37b3641a417f5dbda6b126ef25930df
tree16ade525080980481acfb878d1f1b83f979add6e
parent9d0fc907e8e01ec1bb3e865af1ae097b5ce70be8
parentbfc60f5d1bc92ccbff2e39db84bfe975b4664c98
Merge branch 'MDL-29139' of git://github.com/nebgor/moodle