[yourls/f19: 4/4] Merge branch 'master' into f19

[Martin Krizek]

commit 0d05b6a9445257664224e8669907f4d88860a28e
Merge: 087085f 277530c
Author: Martin Krizek <mkrizek at redhat.com>
Date:   Thu Feb 13 14:46:57 2014 +0100

    Merge branch 'master' into f19
    
    Conflicts:
    	.gitignore
    	sources
    	yourls.change-config-path.patch
    	yourls.spec

 .gitignore                                         |    1 +
 ...-for-new-version-when-updating-or-install.patch |   28 ++++++++++++++++++++
 sources                                            |    2 +-
 yourls.change-config-path.patch                    |    8 +++---
 yourls.spec                                        |   15 +++++++++-
 5 files changed, 47 insertions(+), 7 deletions(-)
---