Merge branch 'wip-MDL-33013-m25' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Mar 2013 19:18:48 +0000 (20:18 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Mar 2013 19:18:48 +0000 (20:18 +0100)
commitd03d5e7816dbcbb9f5e4e7f5ada3979e2be45587
treebf5b6017de571cec6989608385127e8cb21031f3
parentbb8f31dbf3b938e9964c7a5023da445da26ec7ae
parentba7b1ca565c8a59a54bddf7a89881bac2256cff1
Merge branch 'wip-MDL-33013-m25' of git://github.com/samhemelryk/moodle