Merge branch 'wip-MDL-30540-master' of git://github.com/phalacee/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Feb 2012 00:17:51 +0000 (01:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Feb 2012 00:17:51 +0000 (01:17 +0100)
commitae8c201905963b1bfcf3c6007a4d1a2a328f7950
treeb3eae4b2b9c65ae83fd04275ca638177c0db6590
parente80898b52553f21d40fe4ab0d781320828cd56bb
parentae6313d4a7ab0d5d701bbaab806c44f256528b97
Merge branch 'wip-MDL-30540-master' of git://github.com/phalacee/moodle