summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-04-14 02:06:59 +0100
committerPaul Phillips <paulp@improving.org>2012-04-14 02:06:59 +0100
commit909bcb89d27cd7d7f754a02eb1f1362e0f7abe54 (patch)
tree7ed9d0b77416d0620b520183f4ad516ee10804df /test
parentc26f2ae86bb8ecdfc07787c1ad66350c6cb8b36b (diff)
parente29681b95a215e8edf9e0f272d2a76aadac14fff (diff)
parent66f75183c0614681c61eaa4f3af005be040ddd11 (diff)
downloadscala-909bcb89d27cd7d7f754a02eb1f1362e0f7abe54.tar.gz
scala-909bcb89d27cd7d7f754a02eb1f1362e0f7abe54.tar.bz2
scala-909bcb89d27cd7d7f754a02eb1f1362e0f7abe54.zip
Merge commit 'refs/pull/389/head'; commit 'refs/pull/393/head' into develop