Bump version to 2.0.4.

Update Automake to 1.16.1.

Merge pull request log4cplus#372 from wilx/2.0.x

Update for 2.0.3.

Merge pull request log4cplus#337 from wilx/2.0.x

Merge.

Merge pull request log4cplus#314 from wilx/2.0.x

Merge.

Merge remote-tracking branch 'github-log4cplus-log4cplus/2.0.x' into …

…2.0.x

Update ChangeLog for 1.2.1.

Merge pull request log4cplus#263 from wilx/1.2.x

Merge.

Update for 1.1.3-RC8.

Merge remote-tracking branch 'origin/master' into 2.0.x