Merge branch 'release/3.2' into develop

Author: maxme

WordPress/src/main/java/org/wordpress/android/datasets/ReaderDatabase.java

@@ -19,7 +19,7 @@
  */
 public class ReaderDatabase extends SQLiteOpenHelper {
     protected static final String DB_NAME = "wpreader.db";
-    private static final int DB_VERSION = 90;
+    private static final int DB_VERSION = 92;
 
     /*
      * version history
@@ -43,6 +43,7 @@ public class ReaderDatabase extends SQLiteOpenHelper {
      *   84 - added tbl_attachments
      *   85 - removed tbl_attachments, added attachments_json to tbl_posts
      *   90 - added default values for all INTEGER columns that were missing them (hotfix 3.1.1)
+     *   92 - added default values for all INTEGER columns that were missing them (3.2)
      */
 
     /*

WordPress/src/main/java/org/wordpress/android/datasets/ReaderPostTable.java

@@ -52,8 +52,8 @@ public class ReaderPostTable {
 
     protected static void createTables(SQLiteDatabase db) {
         db.execSQL("CREATE TABLE tbl_posts ("
-                + "	post_id		        INTEGER DEFAULT 0,"   // post_id for WP blogs, feed_item_id for non-WP blogs
-                + " blog_id             INTEGER DEFAULT 0,"   // blog_id for WP blogs, feed_id for non-WP blogs
+                + "	post_id		        INTEGER DEFAULT 0,"       // post_id for WP blogs, feed_item_id for non-WP blogs
+                + " blog_id             INTEGER DEFAULT 0,"       // blog_id for WP blogs, feed_id for non-WP blogs
                 + " pseudo_id           TEXT NOT NULL,"
                 + "	author_name	        TEXT,"
                 + " author_id           INTEGER DEFAULT 0,"