Merge branch 'MDL-32630-workshop-calendar_21' of git://github.com/mudrd8mz/moodle...
commit538d482927f619d561dd0f43a52e91d7763ef01d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2012 00:21:22 +0000 (26 02:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2012 00:21:22 +0000 (26 02:21 +0200)
treefe49d8082fc18dfbe104b7be8d82ace9677fbc76
parent7a48124d69d5e18f75c19a7040bc2a41439e5c2c
parent8683c24f737c95db5b034df51228cee1b4efcb4e
Merge branch 'MDL-32630-workshop-calendar_21' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE