[Calypso] The patches from chrysn, rebased to latest master

[Guido Günther]

On Wed, Jan 27, 2016 at 12:01:10PM +0100, Petter Reinholdtsen wrote:
[..snip..]
> Personally, I suspect it is best to merge the entire set, as it is used
> by several people already and seem to be a good set of features to have
> in calypso, and then move on from there with adding tests and improving
> calypso further.

Let's not merge code that nobody knows what exactly it does. Go patch by
patch with review, testing with common clients.

CHeers,
 -- Guido