Merge remote-tracking branch 'origin/master' into identity_abe
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 3 Aug 2017 10:21:28 +0000 (19:21 +0900)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 3 Aug 2017 10:21:28 +0000 (19:21 +0900)
commit02c92c69ab4193b81ac6f90b52fecb40b94b9208
tree0cbbfc249451abd23b238a811f42015df95bbe2a
parentb6755fe23d258a4dc971d8fabc3fae1873e31271
parent6bcc73a1cbb1d4a609884762eab1b6de761ad1d9
Merge remote-tracking branch 'origin/master' into identity_abe
configure.ac
src/util/Makefile.am