Merge branch 'master' into pylons0.10
authorJan Dittberner <jan@dittberner.info>
Fri, 11 Jun 2010 22:54:50 +0000 (00:54 +0200)
committerJan Dittberner <jan@dittberner.info>
Fri, 11 Jun 2010 22:54:50 +0000 (00:54 +0200)
commita527356eae70e5f114aa98b155a5dd2d584dc2c9
tree9390e88046007ed1bf31f955efea6e2ca0569b10
parent41a5e3e6f17d6ad8b01c6e5084e9eacbbc3d32fa
parent2f0cb0da62e4e7a562528e141ca83dc7e9b11ce4
Merge branch 'master' into pylons0.10

* master:
  add support for GPG key lookup finger command and HTTP URL
ddportfolioservice/controllers/ddportfolio.py
ddportfolioservice/i18n/ddportfolioservice.pot
ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo
ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
ddportfolioservice/model/ddportfolio.ini