Merge branch 'wip-MDL-36381-m24' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 8 Nov 2012 01:33:43 +0000 (09:33 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 8 Nov 2012 01:33:43 +0000 (09:33 +0800)
commitbec1b02a9169add54cbd24e000cee04356bde0c9
tree464342d12f63b851f0a62f3870cc1e50784e003d
parent650e6c7339d7a1120d5fe097eaf35e37af8cff6e
parent81ede547f28131aa8a47f1b166365a8b9cc1ce1a
Merge branch 'wip-MDL-36381-m24' of git://github.com/samhemelryk/moodle