Merge branch 'v5-stable' into v5-stable-newstats
authorRainer Gerhards <rgerhards@adiscon.com>
Tue, 24 Jan 2012 17:08:14 +0000 (18:08 +0100)
committerRainer Gerhards <rgerhards@adiscon.com>
Tue, 24 Jan 2012 17:08:14 +0000 (18:08 +0100)
commit590252c2275da8d4ed777a3bb84a227327b3871a
tree6c3ca921a3fa87add582317a92c270a30685d260
parentb41fc354ede3baec9740cb7e6a2f609824269836
parentb029d4751ac77f7ee4c7035c522e6c85601035c1
Merge branch 'v5-stable' into v5-stable-newstats

Conflicts:
configure.ac
configure.ac