Merge branch 'MDL-33326' of git://github.com/stronk7/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 31 May 2012 22:58:08 +0000 (00:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 31 May 2012 22:58:08 +0000 (00:58 +0200)
commit5669b28d59872045d72172c8a61468a839dc3be7
tree8c06cc1768240656be74c1ef7703564d80ae820d
parentdac01a7444706c2a1ee610a08e9fcff829d6dbe5
parent294d976e288bd62b34655e2de520904b3b4ec1d2
Merge branch 'MDL-33326' of git://github.com/stronk7/moodle