Merge remote-tracking branch 'origin/master' into stable

Conflicts:
	CHANGES

CHANGES

@@ -6,7 +6,7 @@ For further information about Photo Organizer, see its web site at:
 
 ==========================================================================
 
-v2.38 (Unreleased)
+2.37.1 (December 3, 2012)
 
  [misc] Pretty image URLs now include an extension.
  [fix]  Mime type not set properly for images.

README-DEVEL

@@ -1,17 +0,0 @@
-==========================================================================
-
-This is the development code branch of Photo Organizer.  
-
-If you want to set it up, we recommend you first install the latest 
-release version, then upgrade it to the -devel version.  You may need to 
-manually import the contents of src/sql/PENDING.
-
-Things can and do break, and some features may be incomplete or 
-nonfunctional.  Don't use this unless you really need one of the newer 
-features or wish to help out with development.
-
-Changelogs can be obtained via git or via the web site, at
-http://po.shaftnet.org/
-
-==========================================================================
-

src/include/config.php

@@ -303,7 +303,7 @@ error_reporting(E_ALL ^ E_NOTICE);
 /* Default credentials expiration time */
 $default_cred_timeout = 60 * 10;  // 10 minutes
 
-$po_version = "2.38-dev";
+$po_version = "2.37.1";
 
 include_once "auth.php";
 $po_auth = "po_auth_default_db";

src/sql/PENDING

@@ -1,5 +0,0 @@
-----------------------------------------------------------
--- v2.3X to XXXX patch  (Unmerged stuff)
-----------------------------------------------------------
-
---------------------------------- DO NOT APPLY BELOW THIS LINE