Merge branch 'MDL-35151_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE
commitdc5736f40261c3d1101a0889e5d88dde967501dc
authorAparup Banerjee <aparup@moodle.com>
Mon, 3 Sep 2012 11:24:14 +0000 (3 19:24 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 3 Sep 2012 11:24:14 +0000 (3 19:24 +0800)
treeb7714504dc440d8e6ec15779510f2153ca497fe6
parent6915eff9b136c4be26017d94e2ae54c5f1fd4ff7
parentdf1a0756aba5a84efa0a47e69895fcef91268f47
Merge branch 'MDL-35151_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE