Merge branch 'wip-MDL-37869-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 23 Jul 2013 23:28:26 +0000 (11:28 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 23 Jul 2013 23:28:26 +0000 (11:28 +1200)
commit904c38b31deb41ff22a923f54d999d455395d5a7
treefa6435d78e912a60cfb984837d588750b94860d6
parentd853f819dcb014c803f567ab1928517cba395954
parent0ebd16d2b2fd4e2d06f09275869ef1e2788db20e
Merge branch 'wip-MDL-37869-master' of git://github.com/phalacee/moodle