Merge branch 'w26_MDL-39701_m26_filterupgrade' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Jun 2013 10:30:41 +0000 (12:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Jun 2013 10:30:41 +0000 (12:30 +0200)
commit26568ba86584f65245934154db76e63f4fbf0a8d
tree3743e0c9de7bb9d3a43c041d89a8d2d7aedd2b61
parent74618f31d276d6c8a60074f97369fa35edd95db8
parentf18c764a7c364c1ddc2abcc27c977e1a1524a327
Merge branch 'w26_MDL-39701_m26_filterupgrade' of git://github.com/skodak/moodle