Merge branch 'MDL-47916-27' of git://github.com/jleyva/moodle into MOODLE_27_STABLE
commitb33d63351069a5c9a8a9f588751ab139117e00e0
authorMarina Glancy <marina@moodle.com>
Wed, 29 Oct 2014 08:15:32 +0000 (29 16:15 +0800)
committerMarina Glancy <marina@moodle.com>
Wed, 29 Oct 2014 08:15:32 +0000 (29 16:15 +0800)
tree6cdc6c8014cd09a778dc2f9fc5e6c7715e7ab363
parentf9aab389e66fa57a2602642de6a18eccf895cad1
parentd8c1ffd0a0f8ce2bc9c61dd798880cff8ce64ce7
Merge branch 'MDL-47916-27' of git://github.com/jleyva/moodle into MOODLE_27_STABLE