Merge branch 'feature/osx_bundle' into develop
authorTomás Touceda <chiiph@leap.se>
Fri, 22 Nov 2013 14:09:29 +0000 (11:09 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 22 Nov 2013 14:09:29 +0000 (11:09 -0300)
commit33e5c8a339e2ac0300256d81271c05e556fb3083
treec1ceeb3aefab8a13491401a2dd9f6708af498b61
parent9dcd4133733e09f487919e2b55d751040ac6d811
parent870cc8d8d51c600d1b9faa0a2d6a5a9dba8b5354
Merge branch 'feature/osx_bundle' into develop