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)
commit91ca6eb3c01b7f9bbcfd624dfbfcb8910dc65098
treeae65f9047c386ee6b60dcbf19ca33025997e4d69
parentcacfb7e267c2d39c03d49a0157fc6cf23940126d
parent1a9c26bffc5ae9c7d54c4e2b841b248098010b56
Merge branch 'master' into sp/amqp
src/Makefile.am