Merge branch 'master' into pylons0.10

* master: add support for finger command line for db.debian.org query
2010-06-12 23:28:45 +02:00 · 2010-06-12 23:28:45 +02:00 · fac0c223f4
commit fac0c223f4
parent a527356eae 2f93abf0c7
5 changed files with 51 additions and 39 deletions
--- a/ddportfolioservice/controllers/ddportfolio.py
+++ b/ddportfolioservice/controllers/ddportfolio.py
@ -93,7 +93,8 @@ developer name on all bug logs)'),
        'membership' : {
            'label' : N_('Membership'),
            'nm' : N_('NM'),
-            'db' : N_('DB'),
+            'dbfinger' : N_('DB information via finger'),
+            'db' : N_('DB information via HTTP'),
            'alioth' : N_('Alioth'),
            'wiki' : N_('Wiki'),
            'forum' : N_('Forum'),