Merge branch 'w04_MDL-37718_m25_rs' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 00:33:08 +0000 (01:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 00:33:08 +0000 (01:33 +0100)
commit09d6bcc2325da9b66dfc0f93eeea098592e88351
tree73cc2f75829f1979838a1835d3bfc1dc0a52102a
parentee4cac2b44c32b6527165ec7c2f1fcb02c16aee3
parent9e6bfb5221f96deacbee88d740fd6d88484ddcce
Merge branch 'w04_MDL-37718_m25_rs' of git://github.com/skodak/moodle