Merge branch 'MDL-25492_22' of git://github.com/jmvedrine/moodle into MOODLE_22_STABLE
commit6e8d3ac1bfe8557c4f5d535256bf7c8340b7a50d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 18:12:48 +0000 (28 20:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 18:12:48 +0000 (28 20:12 +0200)
tree989bae8c06c8a1cd2f578f350e810de3eb340277
parent1c37f8865d7a9312eab2480b913049f3bf345114
parentdb6bac8b16557996538e92a822e9b4c6970231c2
Merge branch 'MDL-25492_22' of git://github.com/jmvedrine/moodle into MOODLE_22_STABLE