Merge pull request #2942 from ernest-galbrun:tvl1_chambolle
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 20 Aug 2014 14:21:08 +0000 (14:21 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 20 Aug 2014 14:21:08 +0000 (14:21 +0000)
commit44e04da79c6230097ad3c698c6aad14e7049ab54
tree499727623374951708db9dee36c45dd1b854eac2
parentb2cd954f247c8d5c0b83c1671300113128ee5f0e
parent2f077fcd994a717b10b6d62c2c8509d0f8d07a4e
Merge pull request #2942 from ernest-galbrun:tvl1_chambolle