Merge branch 'MDL-37181_master' of https://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Oct 2013 21:32:30 +0000 (23:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Oct 2013 21:32:30 +0000 (23:32 +0200)
commitb1636b4a8b2f0c4c50cb0df7528d7f27058fc2af
tree7a02e98dfc179e9cd6e0f7000afba6c4f928048e
parent04e49ead57193c9b18f3ed17cf7dcc20fc6ec421
parent5043bcfaaef90f62ed02837c77802342dc807d7a
Merge branch 'MDL-37181_master' of https://github.com/markn86/moodle