Merge remote-tracking branch 'gerrit/2012.10' into MasterMerge
authorLars Kneschke <l.kneschke@metaways.de>
Tue, 19 Feb 2013 15:17:41 +0000 (16:17 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Tue, 19 Feb 2013 15:17:41 +0000 (16:17 +0100)
commit738d4faba55be46f47deb98f5feb8026a69fc77a
tree734e0f754b79af9a23de56a6de307e4d5f371f1f
parentfb9c706813eec01212bd84a9ec30bf11e4fca6d5
parent5a702e42deccea97a75f9d797f3d7bf56446e41c
Merge remote-tracking branch 'gerrit/2012.10' into MasterMerge