kde installer: enable networkmanager. Closes #3433
docs: hint to stop NetworkManager during installation to manually configure the network
protobuf: Clean up and update to version 2.6.1.

The upstream URL has changed as well as the download URL. I'm using the
archive from GitHub directly now, because version 2.6.1 hasn't been
uploaded to Google Code yet.

Changed the meta.license attribute to BSD3, because I haven't actually
found anything regarding "mBSD" on the web, so I'm guessing it should
mean "modified BSD". After digging up a bit more, there seems to be
overall consensus on BSD3/"new BSD" license, because it's BSD3 with
copyright of Google Inc. on the license.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
etcd: update to v0.5.0-alpha3
nixos: add etcd module
Add kubernetes
pythonPackages: add docker registry
Merge pull request #5073 from offlinehacker/pkgs/pythonPackages/docker_registry

pythonPackages: add docker registry
Add selendroid
guitarix: update from 0.31.0 to 0.32.0
solr: bump
We had hash for wrong mcabber version and the tarball was cached
Add src revision control software
Merge pull request #4639 from lethalman/installer-nm

kde installer: enable networkmanager. Closes #3433
ardour: update from 3.5.380 to 3.5.403
kernel: 3.10.60 -> 3.10.61
kernel: 3.12.32 -> 3.12.33
cjdns: update 20141023 -> 20141121

include protocol version in package version string
Merge pull request #4992 from offlinehacker/pkgs/kubernetes/add

Add kubernetes
boost: Add dependency fix for ipp files