Merge branch 'MDL-38967_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 21:13:21 +0000 (23:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 21:13:21 +0000 (23:13 +0200)
commita9aa326ea9e22ea8f9bb117b2decd64186769599
tree9d07476ad2cbf39469ce20d81b94ae582ea6a9eb
parent6bb78aedee65dd8467be140b308ec57bf0310d2b
parenteb18e0232f9b2ce4cf7119b7a444928393f0d2b7
Merge branch 'MDL-38967_master' of git://github.com/dmonllao/moodle