Merge branch 'w42_MDL-41935_m26_timediff' of https://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Oct 2013 16:30:49 +0000 (18:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Oct 2013 16:30:49 +0000 (18:30 +0200)
commit6ad40de4652dc77b31fb390ffdd199baab0dd724
tree87dc0382716b00d365380bad48f919cca2de0fc9
parentf8eff10319e1bd67e10634e79002b850702946c6
parent2a67e105b6997c8bdf1723084b431f9362ab5be3
Merge branch 'w42_MDL-41935_m26_timediff' of https://github.com/skodak/moodle