[mosquitto/f20: 4/4] Merge branch 'master' into f20

[Fabian Affolter]

commit 70f3d5de5fb3e6cbaaa66704a733ffc8b3f44d0a
Merge: b2f8efc cc588e7
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date:   Mon Mar 9 00:32:54 2015 +0100

    Merge branch 'master' into f20

 .gitignore     |  1 +
 mosquitto.spec | 41 +++++++++++++----------------------------
 sources        |  2 +-
 3 files changed, 15 insertions(+), 29 deletions(-)
---
diff --cc .gitignore
index 3f393b4,b6509d6..9a4403f
--- a/.gitignore
+++ b/.gitignore
@@@ -9,6 -7,6 +9,7 @@@
  /mosquitto-1.3.1.tar.gz
  /mosquitto-1.3.2.tar.gz
  /mosquitto-1.3.3.tar.gz
 +>>>>>>> master
  /mosquitto-1.3.4.tar.gz
  /mosquitto-1.3.5.tar.gz
+ /mosquitto-1.4.tar.gz