Merge branch 'named-params'
Lukas Mai [Thu, 1 Nov 2012 12:54:03 +0000 (13:54 +0100)]
Conflicts:
MANIFEST

1  2 
MANIFEST
Parameters.xs

diff --cc MANIFEST
Simple merge
diff --cc Parameters.xs
Simple merge