[pnp4nagios/f17: 11/11] Fixed release in changelog. Merge branch 'master' into f17

[Ján ONDREJ]

commit 337d6b6e480daf01303dd0f215e95d6b0d08de36
Merge: 4055b88 e196a08
Author: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
Date:   Mon Mar 4 07:41:01 2013 +0100

    Fixed release in changelog.
    Merge branch 'master' into f17
    
    Conflicts:
    	pnp4nagios.spec

 .gitignore               |    1 +
 pnp4nagios-README.fedora |    2 +-
 pnp4nagios.spec          |   45 +++++++++++++++++++--------------------------
 sources                  |    1 +
 4 files changed, 22 insertions(+), 27 deletions(-)
---