tree d16997672202cc212c97e22ae4cd5abba8537b8f
parent e80130e31482ddc228108e35be4d4d425342de36
parent 24789acc22fe56756aa27cfc9fcc4a2217301ff1
author Jan Kaufman <j.kaufman@tcpcloud.eu> 1446480358 +0100
committer Jan Kaufman <j.kaufman@tcpcloud.eu> 1446480358 +0100

Merge branch 'develop' into 'master'

develop

See merge request !2