Merge branch 'MDL-42377_master' of https://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Oct 2013 23:14:04 +0000 (01:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Oct 2013 23:14:04 +0000 (01:14 +0200)
commit27ee4c13a51a4abdcb746c9ae0b694d73f4514ef
tree474c2d0663267826c0a69a213054fb8cf4ce4f1e
parent7419751a4c05d32144474c6e98288f6ed7e8376a
parent4543bf24231a6ec4b03e2d5c27fd96efdb4469c2
Merge branch 'MDL-42377_master' of https://github.com/markn86/moodle