merge of '09d1b2512f779b9c9aa72bb056bca43fade5f3a2'

     and 'b39b4fea1e7adda93fd9f133e4dee4b68b396bab'

i2p2www/blog/shortlinks.py

@@ -10,6 +10,7 @@
 BLOG_SHORTLINKS = {
     'i2pcon': '2015/07/16/I2PCon',
     'toronto': '2015/07/16/I2PCon',
+    'i2pcon': '2015/07/16/I2PCon',
     '0.9.19': '2015/04/12/0.9.19-Release',
     '0.9.20': '2015/06/02/0.9.20-Release',
 }