Merge branch 'wip-MDL-45429-m26' of git://github.com/marinaglancy/moodle into MOODLE_...
commit34d75ff1157ab11142b70b36abe74d6e427e55cb
authorDan Poltawski <dan@moodle.com>
Wed, 7 May 2014 03:50:13 +0000 (7 11:50 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 7 May 2014 03:50:13 +0000 (7 11:50 +0800)
tree5b41272a75a550b176116be64afcfa034585e141
parentb37c9cf233b39b45dfd596893487bc3fc968dcbb
parenta9b8d52d84b25b23b53d2cdd8296abaf58a25d6c
Merge branch 'wip-MDL-45429-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE