Merge commit 'stage/master'
commit4762aadc001617c21573bcfc03fb5aec565c7ff6
authorJan Kassens <jan@kassens.net>
Thu, 21 Aug 2008 15:37:52 +0000 (21 17:37 +0200)
committerJan Kassens <jan@kassens.net>
Thu, 21 Aug 2008 15:37:52 +0000 (21 17:37 +0200)
tree1bfee483a5fbce5ad250c076d2470d5188667f05
parent1f54886e820fcc1af70be2cbe760ff8698615875
parentc509d863b78334c817fe1b4376d581baeac86de0
Merge commit 'stage/master'