Merge remote-tracking branch 'kali/bug/update_deps' into develop
authorTomás Touceda <chiiph@leap.se>
Fri, 23 Aug 2013 13:21:54 +0000 (10:21 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 23 Aug 2013 13:21:54 +0000 (10:21 -0300)

Trivial merge