Merge branch 'MDL-48276-27' of git://github.com/danpoltawski/moodle into MOODLE_27_STABLE
commitc1d259808396654d4edb1db7077526a84ad37b18
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Nov 2014 17:45:40 +0000 (25 18:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Nov 2014 17:45:40 +0000 (25 18:45 +0100)
tree61b94f14815001f08a5321586a4cbe14df0fe464
parent736e200028c0c0fea289ba33e4cc168bbf3686ba
parentcf599bc8894583361186334d191b5dfd44ba9e2f
Merge branch 'MDL-48276-27' of git://github.com/danpoltawski/moodle into MOODLE_27_STABLE