Merge branch 'master' into metadata
Lukas Mai [Wed, 14 Nov 2012 14:11:21 +0000 (15:11 +0100)]
1  2 
MANIFEST
Parameters.xs

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