Merge branch 'MDL-22308_20' of git://git.catalyst.net.nz/moodle-r2
authorPetr Skoda <commits@skodak.org>
Sun, 17 Apr 2011 14:30:41 +0000 (16:30 +0200)
committerPetr Skoda <commits@skodak.org>
Sun, 17 Apr 2011 14:30:41 +0000 (16:30 +0200)
commitc001225250bcd2349e262e68b7a38b034edb4a44
tree7bbfa11e76c7c847368f45a46afd412564f6e9f4
parentc6423ea2de931bc84822834d2e73e61db3035dd4
parent6e9ce8e76637d86990500598592f3bdc7a113ad3
Merge branch 'MDL-22308_20' of git://git.catalyst.net.nz/moodle-r2