Merge branch 'MDL-26277-master' of https://github.com/mackensen/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 21:07:34 +0000 (09:07 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 21:07:34 +0000 (09:07 +1200)
commite8a20ce85a2a2aaa17fbba65e78f306085d9411c
tree311ee65530e3167580330c16eb6a51f81fcda6d7
parent2c7a72df06244f019bbeac5b424e81da1e848a57
parent280b223d84e3b00a4871ece315c8563967ba5bbf
Merge branch 'MDL-26277-master' of https://github.com/mackensen/moodle