Merge branch 'MDL-38611-master-int' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 22:53:05 +0000 (00:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 22:53:05 +0000 (00:53 +0200)
commita37a6984174b1727396147abf5795773630a2b7e
tree4de352ed7222038350852d0c80138df6583fb5ad
parent75fb3832604a33974afb0c77dab865ff71ede99b
parenta59bbb6e12c1c4f5be135ceb516eec90e77b025b
Merge branch 'MDL-38611-master-int' of git://github.com/FMCorz/moodle