Merge branch 'MDL-45661-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE
commita8b6eaa3c47be996c404e0409498d20e480aacd8
authorMarina Glancy <marina@moodle.com>
Mon, 26 May 2014 06:46:55 +0000 (26 14:46 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 26 May 2014 06:46:55 +0000 (26 14:46 +0800)
treeabb07f1d09abbfbaf5ab1a6cd828a2bc13a228c5
parent25f6bc111d8636f58f3dcff7d4bf541f61173a14
parentd60e4f6684b3cd6217b44e8e24d7137ac056043f
Merge branch 'MDL-45661-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE