Merge branch 'master' of taler.net:/var/git/mint

2015-06-30 14:01:42 +02:00 · 2015-06-30 14:01:42 +02:00 · fddb73c62d
commit fddb73c62d
parent 245adcaab2 d568358317
8 changed files with 2 additions and 2 deletions
--- a/doc/logos/fonts/perpetue/Perpetua_Bold.ttf
+++ b/doc/logos/fonts/perpetue/Perpetua_Bold.ttf
--- a/doc/logos/fonts/perpetue/Perpetua_Bold_Italic.ttf
+++ b/doc/logos/fonts/perpetue/Perpetua_Bold_Italic.ttf
--- a/doc/logos/fonts/perpetue/Perpetua_Italic.ttf
+++ b/doc/logos/fonts/perpetue/Perpetua_Italic.ttf
--- a/doc/logos/fonts/smoth_bight/ELUA-es.txt
+++ b/doc/logos/fonts/smoth_bight/ELUA-es.txt
--- a/doc/logos/fonts/smoth_bight/ELUA.txt
+++ b/doc/logos/fonts/smoth_bight/ELUA.txt
--- a/doc/logos/fonts/smoth_bight/Smoth-Bight
+++ b/doc/logos/fonts/smoth_bight/Smoth-Bight
--- a/doc/logos/fonts/smoth_bight/Smoth-Bight.otf
+++ b/doc/logos/fonts/smoth_bight/Smoth-Bight.otf
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@ -14,8 +14,8 @@

     You should have received a copy of the GNU General Public License
     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */

 /**