![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@noris.net> | |
| Tue, 23 Oct 2007 14:34:17 +0000 (16:34 +0200) | ||
| committer | Florian Forster <octo@noris.net> | |
| Tue, 23 Oct 2007 14:34:17 +0000 (16:34 +0200) | ||
| commit | 38c7319717e785cc4cb158749d2ab02a4a57318c | |
| tree | 930f99c8722a3fda770a2f2208fc6c8f9da3deba | tree | snapshot |
| parent | 28b3758d4f394d6841571fe914f00c55504f66eb | commit | diff |
| parent | 228f99e5802dc8a7b88fbda272b1e3d75bfcd910 | commit | diff |
Merge branch 'master' into ad/memcached
Conflicts:
src/types.db
Conflicts:
src/types.db
| configure.in | diff1 | | diff2 | | blob | history |
| src/Makefile.am | diff1 | | diff2 | | blob | history |
| src/types.db | diff1 | | diff2 | | blob | history |