pidgin/pidgin

00a9ef389aab
Merge upstream, resolve conflicts
syntax: glob
.*.swp
.DS_Store
*.pyc
*~
\#*\#
subprojects/*/
syntax: regexp
^build(.+)?\/
win32-install-dir(\.release)?