Merge branch 'MDL-29847_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit0142a4b5953bbd776a2ced7621cbb8f4e38c2622
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Aug 2012 23:29:08 +0000 (21 01:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Aug 2012 23:29:08 +0000 (21 01:29 +0200)
treea7ac3e9cde16b910695ad246770e96e9025cb2f0
parentd60f8ef2db09f606f8a24245724a41a12dcc51c7
parentcb12522cea72aead237cb433d4d06d4e9f1853c8
Merge branch 'MDL-29847_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE