merge from trunk
commit194dcc0e82397275f6d560ba454774b88e96d929
authorJoakim Verona <joakim@verona.se>
Wed, 21 Aug 2013 06:33:57 +0000 (21 08:33 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 21 Aug 2013 06:33:57 +0000 (21 08:33 +0200)
tree3316b5b98364872046a723f9b9b204fa161a08f5
parent5092c2e28a39e6fdf63cad5d9c59a53687ea807e
parentf035e3a91c7fc311c7aec170ca93faae40818b3f
merge from trunk
configure.ac