[SCM] BOINC packaging branch, master, updated. upstream/7.0.52+dfsg-661-g84a1b3a

[Guo Yixuan]

The following commit has been merged in the master branch:
commit 8ef4b58312f08b7de6b3ae79abd585147e4fa6c0
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Wed Feb 20 16:05:39 2013 +0800

    ignore .swp files
    
    and don't ignore .gitignore :)

diff --git a/.gitignore b/.gitignore
index bd36765..46726c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,7 +35,6 @@ aclocal.m4
 autom4te.cache/
 autoreconf-stamp
 */*.po
-./.gitignore
 */*.php
 lib/crypt_prog
 debian/boinc-client/
@@ -57,7 +56,7 @@ debian/patches/debian-changes-*
 version.log
 svn_version.h
 version.h
-*/.*.swp
+.*.swp
 apps/1sec
 apps/concat
 apps/upper_case

-- 
BOINC packaging