Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging ...

Conflicts:
	pkgs/servers/serfdom/default.nix

2014-07-01 11:25:41 +02:00

..

documentation

man-pages: Update to 3.64

2014-04-16 18:43:38 +02:00

fonts

Create some meta for the AnonymousPro font

2014-07-01 11:54:08 +04:00

icons

hicolor_icon_theme: minor update 0.12 -> 0.13

2013-12-28 15:08:47 +01:00

misc

Another attempt to eradicate ensureDir

2014-06-30 14:56:10 +02:00

sgml+xml

docbook5_xsl: update from 1.75.2 to 1.78.1

2014-04-09 12:41:10 +02:00