Merge remote-tracking branch 'refs/remotes/kali/feature/memoize' into develop
authorTomás Touceda <chiiph@leap.se>
Tue, 17 Dec 2013 17:53:16 +0000 (14:53 -0300)
committerTomás Touceda <chiiph@leap.se>
Tue, 17 Dec 2013 17:53:16 +0000 (14:53 -0300)

Trivial merge