James Booth 8fde14879a Merge branch 'master' into openpgp ...

Conflicts:
	src/command/commands.c
	src/command/commands.h

2015-06-17 00:40:06 +01:00

..

functionaltests

Set columns when running functional tests

2015-06-13 23:59:33 +01:00

unittests

Merge branch 'master' into openpgp

2015-06-17 00:40:06 +01:00