Merge branch 'release-0.26'

Author: longsleep

.gitignore

@@ -4,7 +4,7 @@
 /src/github.com
 /src/golang.struktur.de
 /*.pprof
-/server.conf
+/server.conf*
 /*.log
 /changelog*.txt
 /src/styles/.sass-cache

.travis.yml

@@ -3,16 +3,13 @@
 language: go
 
 go:
-  - 1.1
-  - 1.2
   - 1.3
   - 1.4
   - 1.5
   - 1.6
 
 env:
-  - GEM_HOME=/var/lib/gems/1.9.1 USE_GODEPS=0
-  - GEM_HOME=/var/lib/gems/1.9.1 USE_GODEPS=1
+  - GEM_HOME=/var/lib/gems/1.9.1
 
 before_install:
   - sudo add-apt-repository -y ppa:chris-lea/node.js
@@ -23,19 +20,17 @@ install:
   - sudo gem1.9.1 install compass
   - sudo gem1.9.1 install scss-lint
   - npm install
-  - if [ "$USE_GODEPS" = "1" ]; then wget https://raw.githubusercontent.com/pote/gpm/v1.3.2/bin/gpm && chmod +x gpm && sudo mv gpm /usr/local/bin; fi
 
 script:
   - ./autogen.sh
   - ./configure
-  - if [ "$USE_GODEPS" = "0" ]; then make get; fi
-  - if [ "$USE_GODEPS" = "1" ]; then make gpm; fi
   - make styleshint
   # TODO(fancycode): enable styleslint once all styles have been fixed
   # - make styleslint
   - make styles
   - make jshint
   - make javascript
+  - make goget
   - make test
   - make binary
   - make build-i18n

AUTHORS

@@ -6,6 +6,7 @@
 Simon Eisenmann <[email protected]>
 Joachim Bauch <[email protected]>
 Evan Theurer <[email protected]>
+Leon Klingele <[email protected]>
 
 Translation:
-Curt Frisemo <[email protected]>
+Curt Frisemo <[email protected]>