Merge branch 'MDL-30700-22' of git://github.com/damyon/moodle into MOODLE_22_STABLE
commitef3f003a76a5873085fc9691814466d70b8714ae
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Dec 2012 09:32:50 +0000 (13 10:32 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Dec 2012 09:32:50 +0000 (13 10:32 +0100)
treeff85c0fbb98b12ce82f9d697cfe86631a691cb5e
parent25e3fc90aea26eb1eff6c0eb373e8d92283ae7aa
parentb431d0717e0b2563bd604a02ad4184f69d528cc0
Merge branch 'MDL-30700-22' of git://github.com/damyon/moodle into MOODLE_22_STABLE