[gnupg/f18: 2/2] Merge branch 'master' into f18

[Peter Robinson]

commit 62fbf0c28a48a36369dd7fb9244a4e9b256a0952
Merge: 2b7cbd1 a1aaa4d
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Dec 18 19:42:26 2013 +0000

    Merge branch 'master' into f18

 .gitignore |   19 ++-----------------
 1 files changed, 2 insertions(+), 17 deletions(-)
---