Merge remote branch 'starbase/devel' into devel
commit822a1fbf3a41a4af68d1211dc567396f47da980c
authorChristian Thaeter <ct@pipapo.org>
Fri, 20 Aug 2010 18:20:21 +0000 (20 20:20 +0200)
committerChristian Thaeter <ct@pipapo.org>
Fri, 20 Aug 2010 18:20:21 +0000 (20 20:20 +0200)
treed22ecb105c191dda30dda9565151b8cbc15aef16
parent2e78d97cfde5cd776b63836a21c3f2eb3573c03e
parent6c82e278ece64147907d990f0c6b484ed5af9668
Merge remote branch 'starbase/devel' into devel

* starbase/devel:
  test_inc.conf produces the testsuite doc (temp)