From: Eloy Lafuente (stronk7) Date: Mon, 22 Jul 2013 20:36:23 +0000 (+0200) Subject: Merge branch 'wip-MDL-33563-master' of git://github.com/marinaglancy/moodle X-Git-Tag: v2.6.0-beta~910 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=f2515968d2ae776f351c8aa46f80aa16cdae61fa Merge branch 'wip-MDL-33563-master' of git://github.com/marinaglancy/moodle --- f2515968d2ae776f351c8aa46f80aa16cdae61fa