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)
commit0347bf68d394118460566c8cd5cd49c75b0825f7
tree781a047598038d99de4888d856bf8e8e617e87f7
parentb8330f441f094f5d32490b9c6c64b5998eaccf4e
parent5065f2576d58ca7d6344491a26931bc3b1b70588
Merge remote-tracking branch 'drebs/feature/3487-split-soledad-into-common-client-and-server' into develop