Merge branch 'MDL-30652-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 8 Jan 2012 23:02:41 +0000 (12:02 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 8 Jan 2012 23:02:41 +0000 (12:02 +1300)
commit9b69f4a9c9cd66f3a905cff78c91db1a11d95ecf
treec655d3a4c1da3d6fba97371ae5bb4a809213aa2a
parent94a2296a8efd45fbddd0578f81f3a5cb00bd963d
parent85e976e5148a80add66ac8159791ebfe6c612f8e
Merge branch 'MDL-30652-master' of git://github.com/ankitagarwal/moodle