Merge branch 'maint'

* maint:
  vala: fix 'valac' calls for projects with mixed Vala/C
  vala: expose automake bug#10894

diff --cc THANKS
index 9d3c32cd6fb6579a7bbcf473d793e217e9802996,d54e9d4376065af508760488550865f9606595b7..d6080e3be82e34a4477fee841cefb17a970c33e4
--- 1/THANKS
--- 2/THANKS
+++ b/THANKS
@@@ -299,6 -295,6 +299,7 @@@ Phil Nelson                phil@cs.wwu.ed
  Philip Fong           pwlfong@users.sourceforge.net
  Philip S Tellis               philip@ncst.ernet.in
  Пухальский Юрий Андреевич pooh@cryptopro.ru
++Quentin Glidic                sardemff7+gnu@sardemff7.net
  Rainer Orth           ro@techfak.uni-bielefeld.de
  Rafael Laboissiere    laboissiere@psy.mpg.de
  Rainer Tammer         tammer@tammer.net

diff --cc automake.in
Simple merge

diff --cc tests/list-of-tests.mk
Simple merge