tree 60d450315bffeedaecf8c280ae3b96ceba445115
parent 7f89eb831bf7ab9825d988f7a9d1fb6fe4e8b4a9
parent 2fed4c14bc2ab2236f153e8c7ef65cc78d6bf29f
author jan kaufman <jan.kaufman@tcpcloud.eu> 1448025671 +0100
committer jan kaufman <jan.kaufman@tcpcloud.eu> 1448025671 +0100

Merge branch 'master' of git.tcpcloud.eu:saltstack-formulas/heka-formula