Merge branch 'w42_MDL-29884_m22_base32' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Oct 2011 16:03:42 +0000 (18:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Oct 2011 16:03:42 +0000 (18:03 +0200)
commitb64188cd974d446b3347160e4b6c8e5dacee636a
tree1b918c56556d030b7b12746c5a848b44ab03813f
parente9296e6177f23cfda1d12bac516916f7aaa52249
parent8b0f478842a14b18d177464adaa8ad6b37f44237
Merge branch 'w42_MDL-29884_m22_base32' of git://github.com/skodak/moodle