Merge branch 'MDL-31482-master' of git://github.com/sammarshallou/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 8 Feb 2012 01:57:55 +0000 (09:57 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 8 Feb 2012 01:57:55 +0000 (09:57 +0800)
1  2 
lib/moodlelib.php

Simple merge