Merge branch 'w33_MDL-28708_m22_f304' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 21:26:06 +0000 (23:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 21:26:06 +0000 (23:26 +0200)
commitdf1271341545744a1c4d0420efb1feacfcf9f251
tree58f78625209c26a1eff3b137fb0fb71440fc84fe
parent94fd5ebc0659eb601976cfab31e997b8d89c545f
parentffa5e3ddaedf9d1b03fa4fe10cd2d776c6ea8db9
Merge branch 'w33_MDL-28708_m22_f304' of git://github.com/skodak/moodle