Merge branch 'snippets'
commit706585d268c7f402e729188d7f3cbde7b536d183
authorSven Strickroth <email@cs-ware.de>
Tue, 15 Jul 2014 18:52:18 +0000 (15 20:52 +0200)
committerSven Strickroth <email@cs-ware.de>
Tue, 15 Jul 2014 18:52:18 +0000 (15 20:52 +0200)
tree4a74e6eb7702fc58ceefdd1daa91713acc769fb1
parent1d330663255c1df84681dee34a6fec6bf9fc6293
parent1ba3bc7078749c511abb22f033b4da248119e570
Merge branch 'snippets'