Merge branch 'w05_MDL-26104_20_blockconflick' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Jan 2011 15:02:51 +0000 (16:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Jan 2011 15:02:51 +0000 (16:02 +0100)
commitd98c661428194abee054e2920fae228f5a714c9f
tree12c38a229e693301b96560560d93e8904c13ffaf
parent133a9b738eb797a9e166e3945ecfc363e2519f19
parentc1ddac83b3e08fb3a85afee4af2e422606e1a839
Merge branch 'w05_MDL-26104_20_blockconflick' of git://github.com/skodak/moodle