Merge branch '1.8.0' into 1.8.1
authorPavel Labath <pavelo@centrum.sk>
Wed, 3 Mar 2010 10:59:15 +0000 (11:59 +0100)
committerPavel Labath <pavelo@centrum.sk>
Wed, 3 Mar 2010 10:59:15 +0000 (11:59 +0100)
commite639ad45aeeaf43d5d2565d5eaee1ecc8813248c
tree63156d67052512538dd34843f7a176ffdb770881
parentfde58c9d935044452f9ce1b8ae9d2b10c799a54e
parent0c83d64a86fcaf4741f5fdf0013df7f9e48e30ac
Merge branch '1.8.0' into 1.8.1

Conflicts:
configure.ac.in