merge of '30aeb7fe1dccc7f1b3df9125efb69060721ae556'

and '34697e8073805d05053db51f3ca00569aa7662da'
This commit is contained in:
zzz
2012-02-17 12:42:00 +00:00
2 changed files with 6 additions and 2 deletions

View File

@@ -222,5 +222,7 @@ November 11, 2011.
<a href="http://www.isdpodcast.com/podcasts/infosec-daily-podcast-episode-596.mp3">zzz and Lance James interviewed on the InfoSec Daily Podcast Ep. 596 (mp3)</a>
February 16, 2012
</li></ul></div>
</li>
<li><a href="http://www.isdpodcast.com/podpress_trac/web/3516/0/infosec-daily-podcast-episode-596.mp3">zzz and Lance James interviewed on the InfoSec Daily Podcast (mp3)</a> (February 16, 2012)</li>
</ul></div>
{% endblock %}

View File

@@ -189,5 +189,7 @@ November 2011.
Jonathan Cox,
November 11, 2011.
</li></ul></div>
</li>
<li><a href="http://www.isdpodcast.com/podpress_trac/web/3516/0/infosec-daily-podcast-episode-596.mp3">zzz and Lance James interviewed on the InfoSec Daily Podcast (mp3)</a> (February 16, 2012)</li>
</ul></div>
{% endblock %}