tree 18a2ef416381211205504ecfbe2917f93c14c7d2
parent 15784a34b4172b6fe897274bb4cccc600523f21f
parent b6554cb1857d9a2deee2cd7b33fc7bd0ce55612f
author Jan Kaufman <j.kaufman@tcpcloud.eu> 1446563644 +0100
committer Jan Kaufman <j.kaufman@tcpcloud.eu> 1446563644 +0100

Merge branch 'develop' into 'master'

try to fix formatting for timestamp

See merge request !4