[python-keyring/f19: 8/10] Merge branch 'master' into f19

[Christopher Meng]

commit 8eac7d9eb96c01b0a27360b328114b3dd95c8c18
Merge: 7c48a75 253496f
Author: Christopher Meng <rpm at cicku.me>
Date:   Tue Dec 3 13:41:21 2013 +0800

    Merge branch 'master' into f19
    
    Conflicts:
    	.gitignore

 .gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---