Merge branch 'MDL-30744' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 18 Dec 2011 21:21:11 +0000 (10:21 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 18 Dec 2011 21:21:11 +0000 (10:21 +1300)
commit09608abe56afc50fcd94eb9347950c843e359333
tree9fbb47121da670c6ea63dc5a3867b43291bab54d
parentb53bea816790f434d0f9bdaf98005381caf8ba23
parent6f4c71f5feef3eb88cfef0a0510d9d7ade9f7d60
Merge branch 'MDL-30744' of git://github.com/timhunt/moodle