Merge branch 'master' into martin-t/damagetext 391/head
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 24 Feb 2017 17:14:13 +0000 (18:14 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 24 Feb 2017 17:14:13 +0000 (18:14 +0100)
commit71351184593668cd2343528538de2b5aa2235f05
tree9d93c6121c839c0de3156dde5c8390e2506e4012
parent675956fb789670ab751ea1ce3e4dfafb155a2950
parent9953253984870c888418a6b93a7383939017698d
Merge branch 'master' into martin-t/damagetext