Merge branch 'fix-vala-test-for-branch-1.11' into branch-1.11
authorPeter Rosin <peda@lysator.liu.se>
Fri, 2 Mar 2012 12:04:13 +0000 (13:04 +0100)
committerPeter Rosin <peda@lysator.liu.se>
Fri, 2 Mar 2012 12:04:13 +0000 (13:04 +0100)
commit3c0d8213bc1d7a6a11defbd8d1e904fb0a1eee99
tree4e494c8f691c4bb6a0d0b12b097bf29a71163ac9
parentbd7ff422f866a08064eb9a01a106ab1fa6425bf5
parent7d836cd0adf95778b4e5e9d9a87b3fd1842e5c3b
Merge branch 'fix-vala-test-for-branch-1.11' into branch-1.11

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