Merge branch 'MDL-29598_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE
commit90241eaaf86b715341b62c05c4da69c72cefd8e9
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 21:24:11 +0000 (28 23:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 21:24:11 +0000 (28 23:24 +0200)
tree428755914f3d5b3854cd67be5afc57abd0666a95
parent6e8d3ac1bfe8557c4f5d535256bf7c8340b7a50d
parentc52a364c27fb71ec60c6d1c97f1389fd6907981e
Merge branch 'MDL-29598_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE