nixpkgs/maintainers
Lluís Batlle i Rossell 5417c720fd Merging from trunk.
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
2010-08-02 15:48:19 +00:00
..
docs Adding Redstore HTTP RDF/SPARQL server 2010-06-29 22:18:49 +00:00
scripts Merging from trunk. 2010-08-02 15:48:19 +00:00