Merge remote-tracking branch 'drebs/feature/4030_add-cipher-and-digest-algo' into...
authorTomás Touceda <chiiph@leap.se>
Sun, 6 Oct 2013 14:32:03 +0000 (11:32 -0300)
committerTomás Touceda <chiiph@leap.se>
Sun, 6 Oct 2013 14:32:03 +0000 (11:32 -0300)

Trivial merge