Christian Basler 6f4f51aef3 Merge branch 'develop' into feature/ACK ... # Conflicts: # core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java # core/src/main/java/ch/dissem/bitmessage/InternalContext.java # core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java # core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java		2016-04-11 23:41:23 +02:00
..
ch/dissem/bitmessage	Merge branch 'develop' into feature/ACK	2016-04-11 23:41:23 +02:00