Merge commit 'origin/master'
authorintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 03:41:59 +0000 (04:41 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 03:41:59 +0000 (04:41 +0100)
commita151b510bce93efed3d65e677c36f0fa2b65981c
tree01ae1f7e7d31db5d71c24878ef939041fe1140b0
parentf086baf61f643b1372257492eac5b8ec0df4f164
parentc0275aa17f44d7605f542461d800567dde7f79b8
Merge commit 'origin/master'