Yury G. Kudryashov 84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby ... svn path=/nixpkgs/branches/stdenv-updates/; revision=31721		2012-01-19 21:31:51 +00:00
..
akunambol	Reintegrate branches/drop-kde4.5	2011-12-16 10:39:22 +00:00
rsync	rsync: optional feature (disabled by default) to sync devices	2012-01-18 20:38:24 +00:00
unison	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00