Merging again because I was merging in detached state

Samo Penic

2016-12-06 c2c6364dc7d23f21dabd2179e775e93ba4eeb252

 src/bond.h

@@ -1,3 +1,4 @@
/* vim: set ts=4 sts=4 sw=4 noet : */
#ifndef _BOND_H
#define _BOND_H