Merge branch 'w04_MDL-37734_m25_marshack' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 30 Jan 2013 00:11:20 +0000 (01:11 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 30 Jan 2013 00:11:20 +0000 (01:11 +0100)
commitfb44a5db6f1ed7024cbae258fdfa985c6860a2b8
treeab1226e1d60f55d189f0259a9b10e3556a2cfe95
parent6ca12c1cc192b36213f6c740ed4236ee84d63562
parentdd8a39a88170ca0c153e674ff8773eede6d364af
Merge branch 'w04_MDL-37734_m25_marshack' of git://github.com/skodak/moodle