Merge branch 'wip-MDL-39233-m27' of git://github.com/marinaglancy/moodle into MOODLE_...
commitbc180cd1118b81316fec9aee95099ba7f55c27e4
authorDamyon Wiese <damyon@moodle.com>
Mon, 1 Sep 2014 05:40:38 +0000 (1 13:40 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 1 Sep 2014 05:40:38 +0000 (1 13:40 +0800)
tree3a76a52be5908530c9a874a1a1f2d9ea50b8600f
parentb10d7c59aec63e417eef155aaa7c6bb267f72bfc
parent0459ed43e1dafaa54dc2cd00befcb4c2f408b223
Merge branch 'wip-MDL-39233-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE