Merge branch 'dropproof'
authorJoey Hess <joeyh@joeyh.name>
Fri, 9 Oct 2015 22:03:00 +0000 (18:03 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 9 Oct 2015 22:03:00 +0000 (18:03 -0400)
commit22691478cfa5204a5741215da4c7f7e486a306d8
tree45dd372814a747dbcc5930a485534963a6372fdf
parent6719d17136074bf85cd4900e7daf8985e316d317
parent2154b7a38f621d45ff31503c53c67c4f1a1a3d09
Merge branch 'dropproof'