Merge branch 'MDL-37873_master' of git://github.com/dmonllao/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Feb 2013 06:48:40 +0000 (14:48 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Feb 2013 06:48:40 +0000 (14:48 +0800)
commit147f5927425dce6ceb2b665e1bdc3bcb0b7b22a4
treeebcb9396e65cb9dbf4ea418b1de632849398c852
parentf49ec4297310f295af1999eb58d3f5dee1da168e
parent9776ddeee2b088c65cd85520f6be87e2342beb8e
Merge branch 'MDL-37873_master' of git://github.com/dmonllao/moodle

Conflicts:
course/tests/behat/add_activities.feature
course/tests/behat/add_activities.feature