Merge branch 'master' of git://github.com/moodle/moodle into master_MDL-30576
authorMayank Gupa <mayankgupta2005@gmail.com>
Mon, 12 Dec 2011 05:23:23 +0000 (10:53 +0530)
committerMayank Gupa <mayankgupta2005@gmail.com>
Mon, 12 Dec 2011 05:23:23 +0000 (10:53 +0530)

Trivial merge