Merge branch 'MDL-34192' of git://github.com/stronk7/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 12:44:06 +0000 (14:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 12:44:06 +0000 (14:44 +0200)
commitd9700052734d0b44af3a17566642c763d23143b3
treeb5b7f2606274dae56aa04f9d93b436a328b2fd7a
parent23d82edc91bd97793d281ea8cf0c1396d7a35d27
parentdbd0529ae5336814923fab8922d2b36208e30af3
Merge branch 'MDL-34192' of git://github.com/stronk7/moodle