Merge branch 'MDL-31244_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit049b47ca09ec8ba643fe1225c0d606634d5b441c
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 30 Aug 2012 16:32:20 +0000 (30 18:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 30 Aug 2012 16:32:20 +0000 (30 18:32 +0200)
tree5433fe11bc2d53af8b87a6f3141caf5c3949d85a
parent09332feae8c6adc5df8ccafb14058e8d0037d982
parent5a058f33a3502599da84fccb7356cc6de2a80fae
Merge branch 'MDL-31244_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE