Merge branch 'v4-stable' into v5-stable
authorRainer Gerhards <rgerhards@adiscon.com>
Sat, 21 Jan 2012 16:18:16 +0000 (17:18 +0100)
committerRainer Gerhards <rgerhards@adiscon.com>
Sat, 21 Jan 2012 16:18:16 +0000 (17:18 +0100)
commita418fb87ee078456e0761ddb676542c192ae8f04
tree4290712d00046020ffc39d8fe96c5def8a34ce2e
parent92f7e549df5a1333f037cf3b290e3087fd9ad5da
parente4c6373b4fc55af346fc091fd9782326a00b9128
Merge branch 'v4-stable' into v5-stable
ChangeLog
Makefile.am