tree ece0f86d8bfb764278a9a9df35e47dba4d51ec58
parent 0f877f591c2c88c29798ca19ab9f75bc188708fb
parent e253cf7671e20c33b885c928dd7c7349f7d78579
author jan kaufman <jan.kaufman@tcpcloud.eu> 1446638227 +0100
committer jan kaufman <jan.kaufman@tcpcloud.eu> 1446638227 +0100

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