[pnp4nagios/el6] (5 commits) ...Merge branch 'master' into el6 Updated to 0.6.1. Conflicts: pnp4nagios.spec

[Ján ONDREJ]

Summary of changes:

  0cd17e2... Update to 0.6.1. (*)
  c07bfb2... Uploaded tar package. (*)
  6fb8293... Updated renaming of "-sample" config files. (*)
  18d361a... - Updated renaming of "-sample" config files. (*)
  230ffa4... Merge branch 'master' into el6 Updated to 0.6.1. Conflicts:

(*) This commit already existed in another branch; no separate mail sent