Merge branch 'tsahlin/more-cc-kb'
commit372d7632e840652d59f53dc5174d76133859b63a
authorColomban Wendling <ban@herbesfolles.org>
Tue, 16 Feb 2016 21:24:24 +0000 (16 22:24 +0100)
committerColomban Wendling <ban@herbesfolles.org>
Tue, 16 Feb 2016 21:24:24 +0000 (16 22:24 +0100)
treeb3d5512777cc1c5d2040e1c347ee061b457c190f
parent8dd77590480852b9f112dce906d2c981cc664ce9
parent54613a26cfc10186a6d383d1a433e2bacaa1de66
Merge branch 'tsahlin/more-cc-kb'

Closes #858.