Merge branch 'MDL-40877-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 04:46:23 +0000 (12:46 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 04:46:23 +0000 (12:46 +0800)
commit92058753ace96bdbf67572ff9103ed0e1cdce4d3
tree70f2a58756d4f46f3294832d1fffb3f39a9682a3
parent7316f46a23d83c7a0352cb7f8b33717aa75b58c9
parente5f9659b7902824fc4ab3b25716b28c6e9bfe29c
Merge branch 'MDL-40877-master' of git://github.com/FMCorz/moodle