[putty/el6: 16/16] Merge branch 'master' into el6

[tremble]

commit 372cbae958c8ef398d99867fa48f984c7c7f4f40
Merge: a16a4fc 5bd6fe0
Author: Mark Chappell <mchappel at redhat.com>
Date:   Wed Sep 17 15:43:27 2014 +0200

    Merge branch 'master' into el6

 .gitignore        |    5 +--
 putty-perms.patch |   11 -------
 putty.png         |  Bin 466 -> 0 bytes
 putty.spec        |   83 ++++++++++++++++++++++++++++++++++++++++-------------
 sources           |    2 +-
 5 files changed, 65 insertions(+), 36 deletions(-)
---