Merge branch 'MDL-41624' of git://github.com/jmvedrine/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 31 Oct 2013 11:17:40 +0000 (22:17 +1100)
committerSam Hemelryk <sam@moodle.com>
Fri, 1 Nov 2013 00:59:31 +0000 (08:59 +0800)
commitbbb430bf5e75950935995a13f7e3b4616cc2de80
tree156f7b98fac54ca5eea5290687e00bc121286341
parentb674a3f6f24d6fa2b7c96c3f8c3aa3cee98e5c45
parent6713708261f7e50f4465526c8317b09ffff922e9
Merge branch 'MDL-41624' of git://github.com/jmvedrine/moodle