Merge branch 'MDL-26408-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 30 Sep 2013 14:01:38 +0000 (16:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 30 Sep 2013 14:01:38 +0000 (16:01 +0200)
commit833d1eb0e2ab3cf306c93d8080e8ee439b0ba1c7
treedb3fcb83a4e86d31351d6367c61522ef958eac7c
parent9e110593261c7664a95915dec156d5dc7689c12a
parentba4612ebdc91c2e093d6451f3e99785e200f3e4c
Merge branch 'MDL-26408-master' of git://github.com/danpoltawski/moodle