Merge branch 'w33_MDL-28709_m22_h304' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 21:16:29 +0000 (23:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 21:16:29 +0000 (23:16 +0200)
commit94fd5ebc0659eb601976cfab31e997b8d89c545f
tree13b610723b0c6aa0dfafa93a1ad226708ab86751
parent3a6cd081e41dff1bd214a1eab1097ba42c9a3008
parentaa603b14c7e1188de2a16e3e1f7375eac88fa80b
Merge branch 'w33_MDL-28709_m22_h304' of git://github.com/skodak/moodle