[commit] master: Merge branch '1.2'

2017-10-01 Thread Oswald Buddenhagen via isync-devel
Skipped 6 existing revision(s) on branch 'master'. commit 1b354fa61a703cf4901f782d9effa689a9f03a7a Merge: 118fdc4 f2524d0 Author: Oswald Buddenhagen Date: Sun Oct 1 10:38:43 2017 +0200 Merge branch '1.2' Conflicts: Makefile.am configure.ac

[commit] master: Merge branch '1.2'

2016-12-11 Thread Oswald Buddenhagen
Skipped 9 existing revision(s) on branch 'master'. commit ab955ffe6b66ccc87ac9364598f8681d8f415be9 Merge: 2bba9b9 7439687 Author: Oswald Buddenhagen Date: Sun Dec 11 12:52:46 2016 +0100 Merge branch '1.2' Conflicts: src/drv_imap.c src/drv_imap.c |