Yury G. Kudryashov
a670a7aca1
merge trunk
A few conflicts due to renames
svn path=/nixpkgs/branches/stdenv-updates/; revision=30947
2011-12-16 22:57:21 +00:00
..
2011-12-16 22:57:21 +00:00
2011-12-16 18:11:23 +00:00
2011-12-05 13:31:31 +00:00
2011-10-25 17:41:43 +00:00
2011-11-18 17:07:40 +00:00
2011-11-29 22:54:22 +00:00
2011-10-06 13:21:07 +00:00
2011-11-22 18:09:33 +00:00