Merge branch 'fix-vala-test'
commit9df2e72d4587b86a5ad49217b11cd8e3d3e63173
authorPeter Rosin <peda@lysator.liu.se>
Fri, 2 Mar 2012 10:49:18 +0000 (2 11:49 +0100)
committerPeter Rosin <peda@lysator.liu.se>
Fri, 2 Mar 2012 10:49:18 +0000 (2 11:49 +0100)
treec13a5110ca72f42458a5d2e8eaa6100122e8c7e2
parent8d0391c50b8205ea6388cba13c16c09c18e57974
parent1da044d6234dba752fbb880180d54ca5fc9a3357
Merge branch 'fix-vala-test'

* fix-vala-test:
  tests: fix (harmless) botched merge
tests/vala.test