Merge branch 'MDL-24235-master' of https://github.com/mackensen/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 4 Mar 2012 23:22:34 +0000 (12:22 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 4 Mar 2012 23:22:34 +0000 (12:22 +1300)
commit26f76c9c6cccee12a8316e75b05f8afd19154ced
tree5522cf4fcfce7055e54e04065cbf738274e1aea6
parenta45621394b0ea2026d6dec3ff22014e584b533cb
parentbe90ed23b50babd2a7e952134f6f40d115f45bbc
Merge branch 'MDL-24235-master' of https://github.com/mackensen/moodle