Merged Tom's changes into my HEAD
authorBjoern Sikora <bjoern.sikora@intra2net.com>
Mon, 27 Jul 2009 08:40:18 +0000 (10:40 +0200)
committerBjoern Sikora <bjoern.sikora@intra2net.com>
Mon, 27 Jul 2009 08:40:18 +0000 (10:40 +0200)
commitbd5651614685a8d318711205ad4cd9bb993f86b7
treedac2ffc8fee2de50bc5dbf16dc7969b1fc1f580a
parent7ec77cf125ac21e7a6c0ef7aa99ab84c71c680d1
parent4248e8ca2f83e33137e3dce90c939f7b21e355a4
Merged Tom's changes into my HEAD

Merge commit '4248e8ca2f83e33137e3dce90c939f7b21e355a4'; commit '7ec77cf125ac21e7a6c0ef7aa99ab84c71c680d1'
src/config.cpp
src/config.h