Merge remote-tracking branch 'marti1125/CB-6949'
authorPiotr Zalewa <piotr@zalewa.info>
Mon, 14 Jul 2014 10:41:08 +0000 (12:41 +0200)
committerPiotr Zalewa <piotr@zalewa.info>
Mon, 14 Jul 2014 10:41:08 +0000 (12:41 +0200)
commita662848f1fbb4e9c1380497ef084cfbb41f86840
tree65c1fc392c1496a9a64991db8d187dcab57f4642
parentc2dafc9760ee9c5e3fcf81f0983100e6b24b6c28
parent58a493cddfe1a3fc0aa942c4a90ccd2108a55638
Merge remote-tracking branch 'marti1125/CB-6949'