Merge branch 'MDL-29987' of https://github.com/bostelm/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 15 Sep 2013 22:13:17 +0000 (10:13 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 15 Sep 2013 22:13:17 +0000 (10:13 +1200)
commit7c76607aaa21c5e5e7d8394b77162d2f2eec35c5
tree23ab894d5840c9d17bcc008300ed2dfc576b7b6e
parentaf0afab30adab961bfe17eeeb53f48736c49846c
parentdf0671f0d26a75896d93882fa0cf22e88f135877
Merge branch 'MDL-29987' of https://github.com/bostelm/moodle