Merge branch 'master' into ja/lua
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 26 Nov 2010 21:50:45 +0000 (22:50 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 26 Nov 2010 21:50:45 +0000 (22:50 +0100)
commit4227efa91b3c2ed7f2e8f8e9b19ab414f7a35e6d
tree8893fb8441e98f44214f450ac3a4137a8c840061
parent19066519e8b3716b48af0155e3e9113df54405b5
parent5c4d218936559af2f6cb9857af7f5b9c8d83be6d
Merge branch 'master' into ja/lua
configure.in