Merge branch 'w51_MDL-35685_m25_capinit_b' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 06:50:29 +0000 (14:50 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 06:50:29 +0000 (14:50 +0800)
commit1a12cbd9dfe1f0bf4dc2cd8924495bb1d4538479
tree1800e192c8394f947b8708342a093fc2f4a18c4c
parentbfb5580f92ec8213c67d887b60ef2e374b87111a
parent2c4bccd5b897b1f5f52983d33c40fd39a4478acb
Merge branch 'w51_MDL-35685_m25_capinit_b' of git://github.com/skodak/moodle