Merge branch 'st/python'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 8 Dec 2009 10:26:37 +0000 (11:26 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 8 Dec 2009 10:26:37 +0000 (11:26 +0100)
commitf9d51dc8fabe44f3cd17499713d63b518f0e1853
treeb4e6388e97a3e765992c126f3e3175a9f86a8992
parentca5af2937040553d53be13b5d5e049c6495c6423
parent40f9ed6fcb9bd09662798023f6197f32a1dbfc58
Merge branch 'st/python'

Conflicts:
README
configure.in
src/owniptc/libiptc.c
src/types.db
AUTHORS
README
configure.in
src/Makefile.am
src/configfile.c
src/plugin.c