Merge remote branch 'origin/master'
authorSven Donath <lxo@dexo.de>
Thu, 18 Oct 2012 15:16:34 +0000 (17:16 +0200)
committerSven Donath <lxo@dexo.de>
Thu, 18 Oct 2012 15:16:34 +0000 (17:16 +0200)
commita42c190f6d6a524d68c451b9f103e0a0a3a07362
treeeb60486e35ddf422a5a04a2e538db6dbc75b8b39
parent6a268229744c1a25a9c33f44bc2e4bc8c041bc14
parentfc41222c61dbee590005f04c50e8603581462543
Merge remote branch 'origin/master'