Code

Merge remote-tracking branch 'origin/pr/371'
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 19 Jul 2013 18:48:40 +0000 (20:48 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 19 Jul 2013 18:48:40 +0000 (20:48 +0200)
commit9b022ebf40a1a49bedf5992e6542c1c0b6a62c13
tree37d6143438c48e512f4f06580a033c13e7a88b32
parent259470e31a45e46b8cfcd65b9088d45598aaea7f
parent29a58124b9c561019df84f07d334a161a6cd6ab0
Merge remote-tracking branch 'origin/pr/371'