Merge branch 'MDL-29129-master' of https://github.com/mackensen/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Aug 2012 21:58:27 +0000 (23:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Aug 2012 21:58:27 +0000 (23:58 +0200)
commit80913617e8de61fce769632d15b1e32f1fb7fa68
tree671d3c3434f30feb2883bfcf63542b48893319a3
parent60312b31895cc0ef65baa30bca5f2f8dc1f6fdfc
parent9ff5e8690957f6d4012a09ed77d8c44847ca3015
Merge branch 'MDL-29129-master' of https://github.com/mackensen/moodle