Merge branch 'master' into sp/amqp
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 6 Aug 2010 13:02:57 +0000 (15:02 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 6 Aug 2010 13:02:57 +0000 (15:02 +0200)
1  2 
src/Makefile.am

diff --cc src/Makefile.am
Simple merge