tree 5a1643e5154a7b434df9981ddbbe4defe269c729
parent a93d3c538a5b68102500420ecd6b80145124342f
parent f809da27a8f222a5dd643ed52659b717385b8562
author Akron <nils@diewald-online.de> 1434979800 +0200
committer Akron <nils@diewald-online.de> 1434979800 +0200

Merge branch 'new-krill-api'

Conflicts:
	kalamar.conf