Merge branch 'master' into 4844-stricter-min-nodes-wip
authorWard Vandewege <ward@curoverse.com>
Tue, 23 Dec 2014 20:47:23 +0000 (15:47 -0500)
committerWard Vandewege <ward@curoverse.com>
Tue, 23 Dec 2014 20:47:23 +0000 (15:47 -0500)
commit35016e091b321c41b6632d32a45f4b5591e98c67
treec6ed78ec003fff8a3f9be8e0febec675ccbbc41f
parentfb2099b1de222b4aa05dd2ce12654ff32da3c18d
parent4d154281759194e776b4fd2fa925de5036c2a3f4
Merge branch 'master' into 4844-stricter-min-nodes-wip