[SCM] BOINC packaging branch, master, updated. debian/7.1.21+dfsg-2_exp1-3-gb03cea7

[Steffen Moeller]

The following commit has been merged in the master branch:
commit b03cea7e42cba92fe3007c2ad43e1d402457a96d
Merge: 4511108ccc47547aea923a1dd61d60b26df05780 42b71b1afec51c1bb346c2df4e2e2822ba6e1fe1
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Fri Jun 28 01:06:19 2013 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-boinc/boinc
    
    Conflicts:
    	debian/changelog

diff --combined .gitignore
index 46726c0,46726c0..3e818ae
--- a/.gitignore
+++ b/.gitignore
@@@ -34,6 -34,6 +34,7 @@@ config.h.i
  aclocal.m4
  autom4te.cache/
  autoreconf-stamp
++*/*.mo
  */*.po
  */*.php
  lib/crypt_prog
diff --combined debian/changelog
index cbeaa08,4e47062..ea4d18b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,4 +1,10 @@@
 -boinc (7.1.21+dfsg-2~exp1) experimental; urgency=low
 +boinc (7.1.21+dfsg-1exp2) experimental; urgency=low
 +
 +  * php5-gd only recommended for boinc-server-maker
 +
 + -- Steffen Moeller <moeller at debian.org>  Thu, 27 Jun 2013 22:05:48 +0200
 +
- boinc (7.1.21+dfsg-1~exp1) UNRELEASED; urgency=low
++boinc (7.1.21+dfsg-1exp1) UNRELEASED; urgency=low
  
    * Added boinc-server-maker package.
  

-- 
BOINC packaging