Merge branch 'zoom-tele-picopix'
authorAntonio Ospite <ao2@ao2.it>
Wed, 7 May 2014 19:40:44 +0000 (21:40 +0200)
committerAntonio Ospite <ao2@ao2.it>
Wed, 7 May 2014 19:40:44 +0000 (21:40 +0200)
commit8fb663458b08cc5cb79ec824348919ee239b4da3
treed103892c873b4621f8db7e8a2d4b6b5a1fc9e1a5
parent2d1f8c13ccce07e38c0dd08e28323f2dcbd14bc8
parent480a86df37dc909884d4d994e93d6daee53fd9a9
Merge branch 'zoom-tele-picopix'