[rear: 7/7] Merge branch 'master' of ssh://pkgs.fedoraproject.org/rear

[Gratien Dhaese]

commit 5415040bdb2bb59fe9d60834ef02a716b9c46e0b
Merge: 25cdd66 e7d7f8d
Author: Gratien D'haese <gratien.dhaese at gmail.com>
Date:   Tue Aug 27 14:42:32 2013 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/rear
    
    Conflicts:
    	.gitignore
    	rear.spec
    	sources

 .gitignore |    1 +
 sources    |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index 0000000,1d6a1da..d1937ad
mode 000000,100644..100644
--- a/.gitignore
+++ b/.gitignore
@@@ -1,0 -1,1 +1,1 @@@
 -rear-1.12.0.tar.gz
++/rear-1.14.tar.gz
diff --cc sources
index 0000000,74eee3d..958a297
mode 000000,100644..100644
--- a/sources
+++ b/sources
@@@ -1,0 -1,1 +1,1 @@@
 -bdda6ef44045d9602f07226669b7cf70  rear-1.12.0.tar.gz
++2aa597f8d5803be9bc79607839e4ff88  rear-1.14.tar.gz