syncthing: update from 0.8.11 to 0.8.15
php-packages: add zmq
Update zotero 4.0.20 -> 4.0.21.1
libgnome: fix build by adding missing libogg
libgnome: add libogg some more
python nose-1.3.3
Merge branch 'php-zmq' of git://github.com/proger/nixpkgs

php-packages: add zmq
Merge pull request #3026 from ttuegel/zotero

Update zotero 4.0.20 -> 4.0.21.1
Merge pull request #3019 from matejc/syncthing0815

syncthing: update from 0.8.11 to 0.8.15
Implement per-user socket units
haskell-free-operational: Remove expression
hoogle-local: Add patch based on main hoogle expression
emacs-modes-emms, emacs-modes-org: Relax platform qualifier
haskell-git-annex: downgrade to version 5.20140606 to fix test suite errors