Merge branch 'MDL-42187_master' of git://github.com/kordan/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 14 Oct 2013 06:50:53 +0000 (14:50 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 14 Oct 2013 06:50:53 +0000 (14:50 +0800)
commit71c2e40993ae6ef1c68e124da4fce2283bb49e93
tree377fcbaea1a098b62f86903d042bf5b7cd05a677
parent7a1ce7769c1e57819c8f3520b33ae61cf5fb397f
parentf846568b6f0480d07a71bc125111a706e3a99b26
Merge branch 'MDL-42187_master' of git://github.com/kordan/moodle