[libtasn1/f21: 4/4] Merge branch 'master' into f21

[Nikos Mavrogiannopoulos]

commit 648c56d5283edc516b9a1a12c0e4f23b6fc5ff09
Merge: fbdcd8f 81140a4
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Mon Aug 25 09:33:42 2014 +0200

    Merge branch 'master' into f21
    
    Conflicts:
    	libtasn1.spec

 .gitignore    |    2 ++
 libtasn1.spec |    7 +++++--
 sources       |    4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)
---