Merge branch 'MDL-30700-22' of git://github.com/damyon/moodle into MOODLE_22_STABLE
commite6e5a4d219083f73d934efdebe82f5ab7d5dfecf
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Dec 2012 19:00:16 +0000 (11 20:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Dec 2012 19:00:16 +0000 (11 20:00 +0100)
treeb6a947a2f37c6821a63cb5d18970b9853afcc7c1
parentf69decef933536b9171b6ddfdf2f1dc98e9c0840
parenteee49d735c8688e8741bb70d1f3ebb786e968723
Merge branch 'MDL-30700-22' of git://github.com/damyon/moodle into MOODLE_22_STABLE