Merge remote-tracking branch 'origin/bugfix/i2p-irc-in-pidgin' into devel
commit76bdc173cb27faffb1ee34b3e78854adb6d8d17c
authorTails developers <amnesia@boum.org>
Tue, 20 Aug 2013 11:02:19 +0000 (20 11:02 +0000)
committerTails developers <amnesia@boum.org>
Tue, 20 Aug 2013 11:02:19 +0000 (20 13:02 +0200)
tree0b723cf513e4e47268e1d0eb7d153161e8f65387
parent9c74de52e0360bc8fa28ddaa1d5a6854ac4d2c8d
parent9925321a1a566648daa9a085f60e9b0623f5d9b1
Merge remote-tracking branch 'origin/bugfix/i2p-irc-in-pidgin' into devel