Merge branch 'MDL-38574_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
commit96b5e3fc494367af7155bf5f175611788338a15e
authorMarina Glancy <marina@moodle.com>
Wed, 13 Nov 2013 00:05:35 +0000 (13 11:05 +1100)
committerMarina Glancy <marina@moodle.com>
Wed, 13 Nov 2013 00:05:35 +0000 (13 11:05 +1100)
tree4588c5451d6bfc82969cdd17663b62882d6aef64
parent4ac33ebc0512c5887120e8e5be8fc73d37886948
parent4ce081c117cba1ab9f76ecb7133507554b9efca8
Merge branch 'MDL-38574_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE