Merge branch 'MDL-26956' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 11:20:23 +0000 (13:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 11:20:23 +0000 (13:20 +0200)
commitc9f8620492ebc0c823f52291c079cd57803a83ae
tree989c980e8399274fc338a1c8e38ae1d9c99d81ee
parentaed60c64afa8cd7d41695866174596bfb0c61b1e
parentd2e32121b085c64ed0f4d0a6b1eea4fea1d57c89
Merge branch 'MDL-26956' of git://github.com/timhunt/moodle