From: Robert Kaiser <kairo@kairo.at>
Date: Thu, 13 Nov 2014 03:18:16 +0000 (+0100)
Subject: Merge branch 'master' of linz:/srv/git/tricorder
X-Git-Tag: production~4
X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=5f050b526584513ddae9f326a7ac330e539854fc;p=tricorder.git

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

5f050b526584513ddae9f326a7ac330e539854fc