Merge branch 'MDL-40626-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE
commit55be97fba49cb9adbe6247e9f4c21c229aa72445
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jul 2013 15:41:01 +0000 (22 17:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jul 2013 15:41:01 +0000 (22 17:41 +0200)
tree1468a03fd4acb765ac0a40238ea80920d00a3bb3
parent6ca8973eca94fac993a1af0352bd8504984f99f2
parent448fc8ab1a2ab269f54d91eff2c8d648cad60c51
Merge branch 'MDL-40626-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE