Merge branch 'MDL-28643-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Aug 2011 22:44:44 +0000 (00:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Aug 2011 22:44:44 +0000 (00:44 +0200)
commita50fe03ebe72ff7f14129341a34df19dde72bb17
treef7b230860e4180b87c622de8fbcad851a3a21d1a
parentb59545e6e59fa3fc062d3a75af42ef05459a33f7
parentad275cb4adee492b51e66e10af13b5a2e9982e73
Merge branch 'MDL-28643-master' of git://github.com/sammarshallou/moodle