Merge branch 'wip-MDL-33452-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 13 Jun 2012 07:03:07 +0000 (15:03 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 13 Jun 2012 07:03:07 +0000 (15:03 +0800)
1  2 
repository/lib.php

Simple merge