From: Jan Michel Date: Mon, 22 Apr 2013 09:12:52 +0000 (+0200) Subject: Merge branch 'master' of jspc29:conferences X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=ec5c5a47ae9ea91d2367fd56a47901797291f646;p=conferences.git Merge branch 'master' of jspc29:conferences --- ec5c5a47ae9ea91d2367fd56a47901797291f646