Merge branch 'master_MDL-38489' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 21:02:32 +0000 (09:02 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 21:02:32 +0000 (09:02 +1200)
commit77365f7ff68f292860459184d1aebcbd6987e8d8
treefaec59437c3b0758d1efee4c8673651e5d2a8e29
parentf34af1167acb6696d188fb64a8b65336fd36a789
parentb98dcd7dd68f09823c666bbdabcfbe9633273522
Merge branch 'master_MDL-38489' of git://github.com/danmarsden/moodle