Merge branch 'wip-MDL-30072-master' of git://github.com/phalacee/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 25 Feb 2013 04:37:56 +0000 (12:37 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 25 Feb 2013 04:37:56 +0000 (12:37 +0800)
commitcc7a1c891659ee81819ebfd31eac240a3928e12a
treeca0d8de7f483bce2f87a9f5e337604fe43fbd853
parent7e6c6743028ec5e6b5957eb3f7ab0750c308f440
parent34348b2b43af01e79daa2b5a641cbcc880655372
Merge branch 'wip-MDL-30072-master' of git://github.com/phalacee/moodle