Merge commit '17085c562a98f278d30816b003ada1a0ac51e17c'
authorBruno Friedmann <bruno@ioda-net.ch>
Mon, 21 May 2012 15:09:58 +0000 (17:09 +0200)
committerBruno Friedmann <bruno@ioda-net.ch>
Mon, 21 May 2012 15:09:58 +0000 (17:09 +0200)
commitae745db7a83ef55c5a183bc3c2342acd817e6989
tree5d41e0369f5d91432c014f06e07d785644484ca5
parentd697963117387d5bb25d5b785096bc8de0cc3354
parent17085c562a98f278d30816b003ada1a0ac51e17c
Merge commit '17085c562a98f278d30816b003ada1a0ac51e17c'