Merge branch 'master' into ad/memcached
authorFlorian Forster <octo@noris.net>
Tue, 23 Oct 2007 14:34:17 +0000 (16:34 +0200)
committerFlorian Forster <octo@noris.net>
Tue, 23 Oct 2007 14:34:17 +0000 (16:34 +0200)
commit38c7319717e785cc4cb158749d2ab02a4a57318c
tree930f99c8722a3fda770a2f2208fc6c8f9da3deba
parent28b3758d4f394d6841571fe914f00c55504f66eb
parent228f99e5802dc8a7b88fbda272b1e3d75bfcd910
Merge branch 'master' into ad/memcached

Conflicts:

src/types.db
configure.in
src/Makefile.am
src/types.db