Merge automatic and manual code changes for new cell connections API
authorClifford Wolf <clifford@clifford.at>
Sat, 26 Jul 2014 14:00:30 +0000 (16:00 +0200)
committerClifford Wolf <clifford@clifford.at>
Sat, 26 Jul 2014 14:00:30 +0000 (16:00 +0200)

Trivial merge