Merge remote-tracking branch 'refs/remotes/kali/fix-changelog-year' into develop
authorTomás Touceda <chiiph@leap.se>
Tue, 8 Apr 2014 20:02:59 +0000 (17:02 -0300)
committerTomás Touceda <chiiph@leap.se>
Tue, 8 Apr 2014 20:02:59 +0000 (17:02 -0300)
commit39bb168614aeb5cb2c1454a58f47f77e0b2568c4
tree4cd3cc9d197ef7ae794f55ba3b5cb92ec141b7ce
parent75309e8bd6b762cad41eaf7d6bf8d4a3696105d2
parentbc26498583c7bf6e3b3121766aa612aaed51b2f9
Merge remote-tracking branch 'refs/remotes/kali/fix-changelog-year' into develop