From: Evan Prodromou <evan@status.net>
Date: Tue, 10 Nov 2009 19:26:49 +0000 (-0500)
Subject: Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7ae10c27b0725a7108b63a788affd4d07e37afdc;p=quix0rs-gnu-social.git

Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
	lib/util.php
---

7ae10c27b0725a7108b63a788affd4d07e37afdc
diff --cc lib/util.php
index 0ed0688eb5,a4865c46c1..65bc6544da
--- a/lib/util.php
+++ b/lib/util.php
@@@ -61,8 -61,8 +61,7 @@@ function common_init_language(
      $language = common_language();
      $locale_set = common_init_locale($language);
      setlocale(LC_CTYPE, 'C');
- 
 -    
 -    // So we don't have to make people install the gettext locales
 +    // So we do not have to make people install the gettext locales
      $path = common_config('site','locale_path');
      bindtextdomain("statusnet", $path);
      bind_textdomain_codeset("statusnet", "UTF-8");