Merge branch 'wip-MDL-27754-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam.hemelryk@gmail.com>
Tue, 2 Aug 2011 06:08:31 +0000 (14:08 +0800)
committerSam Hemelryk <sam.hemelryk@gmail.com>
Tue, 2 Aug 2011 06:08:31 +0000 (14:08 +0800)
commit5867cf50475886e250cc25cf00acc03b40671afa
tree8c41b20ab7781fbb286fc8168af810c2ab421595
parent223b96e0fd8f3f50510146a56af7477fac8879f0
parentf3cf94f70de194a884b9bf03f58de8feda4929e3
Merge branch 'wip-MDL-27754-master' of git://github.com/marinaglancy/moodle