Merge branch 'w25_MDL-40210_m25_badgescaps' of git://github.com/skodak/moodle into...
commit5cc26839e79d05735371e952a0cb3d1365195242
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Jun 2013 22:56:11 +0000 (18 00:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Jun 2013 22:56:11 +0000 (18 00:56 +0200)
tree205afe049319a32a27c8cb7aad6b5e6c83d600bc
parenta831f154aed9764d50d2273360a99a12587f9ca6
parentec18ffb86c6eec8b686a13ecc116dfd8326f9995
Merge branch 'w25_MDL-40210_m25_badgescaps' of git://github.com/skodak/moodle into MOODLE_25_STABLE