From: Robert Kaiser <kairo@kairo.at>
Date: Mon, 10 Dec 2012 03:37:51 +0000 (+0100)
Subject: Merge branch 'master' of linz:/srv/git/tricorder
X-Git-Tag: production~28
X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;ds=sidebyside;h=f5b9d67ff7148a1c3eed923f18000781b97f51e9;hp=f5b9d67ff7148a1c3eed923f18000781b97f51e9;p=tricorder.git

Merge branch 'master' of linz:/srv/git/tricorder
---