Merge branch 'MDL-34939-master' of https://github.com/lucisgit/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 24 Apr 2013 07:01:35 +0000 (15:01 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 24 Apr 2013 07:01:35 +0000 (15:01 +0800)
1  2 
repository/lib.php

Simple merge