* 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
* dm_support:
use unquoted email address for MIA lookup
mark all patterns that require optional information as optional
use email address for MIA pattern to catch non-DDs
add support for automatic DM data lookup
* extraparams:
generate wikihomepage from name if parameter is missing
add translations for new pattern labels
add support for optional patterns
support non unicode fields
add new patterns for wiki and forum
improve handling of missing fields
accept extra fields forumsid and wikihomepage
use the fixed set of dependency versions from Lenny
* extraparams:
generate wikihomepage from name if parameter is missing
add translations for new pattern labels
add support for optional patterns
support non unicode fields
add new patterns for wiki and forum
improve handling of missing fields
accept extra fields forumsid and wikihomepage
* newrules:
updated translations
add ideas for SSH functions as comment
add idea for debconf list search as comment
add Debian search
add website google search
add patch tracker
add piuparts
add support for "firstchar" in patterns
add ubuntudiff to new group Ubuntu
Resolved conflicts:
ddportfolioservice/i18n/ddportfolioservice.pot
ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo
ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
ddportfolioservice/model/ddportfolio.ini
* newrules:
updated translations
add ideas for SSH functions as comment
add idea for debconf list search as comment
add Debian search
add website google search
add patch tracker
add piuparts
add support for "firstchar" in patterns