Merge branch 'w50_MDL-30595_m20_regex' of git://github.com/skodak/moodle into MOODLE_...
commit88ade60cf4d92d08e26036158bdfaae39aab8c3d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Dec 2011 23:25:18 +0000 (8 00:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Dec 2011 23:25:18 +0000 (8 00:25 +0100)
tree37f45f26a5671b943d2d46d863b25491f3e5c732
parent2316dcf0a8733a8ba95a016850c70db10fb40bdc
parent88ec670c505ee94ce0c3f90578669c14d0bc1130
Merge branch 'w50_MDL-30595_m20_regex' of git://github.com/skodak/moodle into MOODLE_20_STABLE