Merge remote-tracking branch 'refs/remotes/ivan/bug/fix-failing-tests' into develop
authorTomás Touceda <chiiph@leap.se>
Fri, 17 Jan 2014 20:52:22 +0000 (17:52 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 17 Jan 2014 20:52:22 +0000 (17:52 -0300)
commit175fcd7e82035dd4806ffb9b55364d000c44caaf
tree6932fbbdfb16373eca01228fba025b0ba9e8524d
parent4ada92f8b062d77925e5f57c65e9d8ae1878934d
parentc4f07e6237ee4b4c0cd2180f00d9d681416fe63c
Merge remote-tracking branch 'refs/remotes/ivan/bug/fix-failing-tests' into develop