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

[Fabian Affolter]

commit b2f8efcd9f101b01070dd5ec1de64da2f29cde9d
Merge: aed5d62 2b73edd
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date:   Thu Oct 16 12:24:33 2014 +0200

    Merge branch 'master' into f20
    
    Conflicts:
    	.gitignore

 .gitignore |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index 34f3eb1,0f20ba9..3f393b4
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,11 +1,14 @@@
++<<<<<<< HEAD
++=======
+ /mosquitto-1.1.3.tar.gz
+ /mosquitto-1.2.tar.gz
+ /mosquitto-1.2.1.tar.gz
+ /mosquitto-1.2.2.tar.gz
+ /mosquitto-1.2.3.tar.gz
+ /mosquitto-1.3.tar.gz
+ /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