Merge tag 'upstream/0.7.2' into debian
authorSam Hartman <hartmans@debian.org>
Tue, 14 Jul 2015 19:39:26 +0000 (15:39 -0400)
committerSam Hartman <hartmans@debian.org>
Tue, 14 Jul 2015 19:39:26 +0000 (15:39 -0400)
commita16ea2937c60337997ca3200a950ded0bcbabdf1
treeba52eec2cd324e5e288bfc9aeb1f4bd2b84d565a
parent54371da47483cfc064a8a1ef5b63a5a48792d216
parent2f69026fca8e82c3e4f6f73b80eec7d7d6315c61
Merge tag 'upstream/0.7.2' into debian

Conflicts:
Makefile.in
aclocal.m4
build-aux/compile
build-aux/config.sub
build-aux/depcomp
build-aux/install-sh
build-aux/ltmain.sh
build-aux/missing
configure
moonshot-ui.spec
po/moonshot-ui.pot
src/moonshot-add-dialog.c
src/moonshot-custom-vbox.c
src/moonshot-id.c
src/moonshot-idcard-store.c
src/moonshot-idcard-widget.c
src/moonshot-identities-manager.c
src/moonshot-identity-management-view.c
src/moonshot-identity-manager-app.c
src/moonshot-identity-request.c
src/moonshot-keyring-store.c
src/moonshot-local-flat-file-store.c
src/moonshot-password-dialog.c
src/moonshot-provisioning-common.c
src/moonshot-server.c
src/moonshot-utils.c
src/moonshot-webp-parser.c
Makefile.am
configure.ac
po/Makefile.in
po/Makevars.template
po/POTFILES
po/remove-potcdate.sed