Merge branch 'master' into pylons0.10
authorJan Dittberner <jan@dittberner.info>
Fri, 11 Jun 2010 20:17:59 +0000 (22:17 +0200)
committerJan Dittberner <jan@dittberner.info>
Fri, 11 Jun 2010 20:17:59 +0000 (22:17 +0200)
commitd5c1fd1a34a5b8c6b3536983480671ce941f4bb7
tree8c8c11be10b7ed541c1bbd197dfe1f897aab375e
parent560aba70d936125efb672abb69962f350544f624
parent95bc1f433d3ed7f739b8263ed471ae715803a62e
Merge branch 'master' into pylons0.10

* master:
  use unquoted email address for MIA lookup
  mark all patterns that require optional information as optional
  update keyringanalyzer.py copyright information
  use email address for MIA pattern to catch non-DDs
  add support for automatic DM data lookup
  silence keyringanalyzer
  fix path handling in keyringanalyzer
  add flattr button
  add flattr button
ddportfolioservice/controllers/ddportfolio.py
ddportfolioservice/model/ddportfolio.ini
ddportfolioservice/templates/showformscript.mako