Merge branch 'master' into pylons0.10
authorJan Dittberner <jan@dittberner.info>
Thu, 3 Jun 2010 22:35:58 +0000 (00:35 +0200)
committerJan Dittberner <jan@dittberner.info>
Thu, 3 Jun 2010 22:35:58 +0000 (00:35 +0200)
commitf2e90118f6871d4bd23f5d1ffb8446d0f5cf02dc
tree88b5f36384d3c7e3b46b3c953215a3c7627892f7
parentf4c2c2d58da574a329902a716aa91b89a1ca10a5
parent4eb94210048547c4ddaf941eaf41a563cd4bf422
Merge branch 'master' into pylons0.10

* master:
  updated translations
  add support for non-url information
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
ddportfolioservice/templates/showurls.mako