Merge remote-tracking branch 'kali/feature/cert_bundle' into develop
authorTomás Touceda <chiiph@leap.se>
Mon, 30 Sep 2013 14:25:21 +0000 (11:25 -0300)
committerTomás Touceda <chiiph@leap.se>
Mon, 30 Sep 2013 14:25:21 +0000 (11:25 -0300)
commit0d3cd5693787d39d611307e673170449ed80704b
treec91cf1124dad29b1d404cde7f27ee28070382c1a
parent241b6494e2bbc09bca23e14aea0271e9335fcb50
parente731adef0f3304098a0aa54cad23fd1769caed76
Merge remote-tracking branch 'kali/feature/cert_bundle' into develop