Merge branch 'newrules' into pylons0.10
authorJan Dittberner <jan@dittberner.info>
Mon, 10 May 2010 19:33:50 +0000 (21:33 +0200)
committerJan Dittberner <jan@dittberner.info>
Mon, 10 May 2010 19:33:50 +0000 (21:33 +0200)
commit03954ba7e96e201baccd0ba04bbf4f44e05fcb4a
tree32e4c9e8b3bc7a6fdf6b52d8af23b22a1d693db9
parentf5363a360cef21e39cd2eff6cd042433cb984efe
parent5509660a6f3f10b120966f1f7857093e26eee78e
Merge branch 'newrules' into pylons0.10

* 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
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