Merge branch 'MDL-41347-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 9 Oct 2013 04:03:54 +0000 (12:03 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 9 Oct 2013 04:03:54 +0000 (12:03 +0800)
commit5cc2c6662d242b5f4f6249b5fc9f004b4a70dfc9
tree152164a9a9ca0601c768dc8fe0913d819fc8822d
parent604fc45ee0baad885f7126f7d5451f4126feb12e
parent7bfc9edd9d9faf3d0ba21ac5faa816e8d5bdb636
Merge branch 'MDL-41347-master' of git://github.com/FMCorz/moodle