Merge branch 'master' into otr

Conflicts: .gitignore
2014-01-05 01:20:42 +00:00
parent e504c030a6 5898da963a
commit f569845b40
7 changed files with 498 additions and 32 deletions
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,6 +68,7 @@ test_sources = \
    tests/log/mock_log.c \
    tests/test_autocomplete.c \
    tests/test_common.c \
+    tests/test_contact.c \
 	tests/test_cmd_connect.c \
 	tests/test_cmd_account.c \
 	tests/test_cmd_rooms.c \