Merge branch 'develop'

oleiade · Sep 11, 2014 · db7bfdc · db7bfdc
2 parents 6763d40 + 20a1eb5
commit db7bfdc
Show file tree

Hide file tree

Showing 85 changed files with 5,079 additions and 2,341 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,7 @@ _testmain.go
 
 # Documentation files
 docs/build/
+
+
+# Intellij
+.idea
diff --git a/.goxc.json b/.goxc.json
@@ -5,6 +5,6 @@
 	"Arch": "386 amd64 arm",
 	"Os": "linux darwin",
 	"BuildConstraints": "linux darwin",
-	"PackageVersion": "0.2.7",
+	"PackageVersion": "0.3.1",
 	"ConfigVersion": "0.9"
 }
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -6,6 +6,8 @@
 
 * [Mthamed](https://github.com/mtahmed)
 * [Fernando Alvarez](https://github.com/fern4lvarez) <[email protected]>
+* [Chris Aumann](https://github.com/chr4)
+* [Benjamin Reitzammer](https://github.com/nureineide)
 
 
 ## Open-source contributions import

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/.travis.yml b/Godeps/_workspace/src/github.com/Sirupsen/logrus/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/README.md b/Godeps/_workspace/src/github.com/Sirupsen/logrus/README.md