Merge branch 'wip-mdl-30121-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_...
commit06606caf718d532db04f89051b82228bc01084f4
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Aug 2012 10:15:29 +0000 (29 12:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Aug 2012 10:15:29 +0000 (29 12:15 +0200)
tree52dbee566c97143d565c33a05fc5ca361692975b
parent12f57ec9c3942dd8d0addc64340555699b17c8f7
parente0b1515fdec0bf14d622ea3a1169d88dec78f403
Merge branch 'wip-mdl-30121-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE