Merge remote-tracking branch 'drebs/feature/3487-split-soledad-into-common-client...
authorTomás Touceda <chiiph@leap.se>
Wed, 21 Aug 2013 17:56:06 +0000 (14:56 -0300)
committerTomás Touceda <chiiph@leap.se>
Wed, 21 Aug 2013 17:56:06 +0000 (14:56 -0300)

Trivial merge