Merge branch 'MDL-41122_master' of git://github.com/kastashov/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 04:28:00 +0000 (12:28 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 04:28:00 +0000 (12:28 +0800)
commit5a2356be38204bfe8a62a7a11d3db8ce5faf3cf8
tree2c919dfec00af0c4d3be23cdef991dc57b5d93e9
parentb277230aadc917693d9c03871e001ea5ad535daf
parentfaaf3f63c2f2e2f041a21a0da0bcd7c8822799b5
Merge branch 'MDL-41122_master' of git://github.com/kastashov/moodle