Merge branch 'sprit'
authorJoey Schulze <joey@infodrom.org>
Thu, 21 Jul 2016 17:22:13 +0000 (19:22 +0200)
committerJoey Schulze <joey@infodrom.org>
Thu, 21 Jul 2016 17:22:13 +0000 (19:22 +0200)
commit5c29b7a54a21146782f26da31040132e420c2be0
tree415b2cdfd83727860b823eefad7998ee06f69d44
parentc21fe02c52bd67377e4b59fe1c129ed4873042b3
parente622a5250ba03a1a91952e9588e3b282cb7933de
Merge branch 'sprit'