Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup

Conflicts:
	apps/contacts/ajax/deletebook.php
	apps/contacts/index.php

1 files changed, 12 insertions, 1 deletions

diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css
index 03b179138e6..070effe3a92 100644
--- a/apps/gallery/css/styles.css
+++ b/apps/gallery/css/styles.css
@@ -1,14 +1,22 @@
 div#gallery_list {
   margin: 90pt 20pt;
 }
+div#gallery_list.leftcontent {
+  padding-top: 15px;
+  margin: 0;
+  text-align: center;
+}
 
 div#gallery_album_box {
   width: 200px;
   text-align: center;
   border: 0;
-  float: left;
+  display: inline-block;
   margin: 5pt;
 }
+.leftcontent div#gallery_album_box {
+  margin: 5px;
+}
 
 div#gallery_album_box h1 {
   font-size: 12pt;
@@ -21,3 +29,6 @@ div#gallery_album_cover {
   border: solid 1px black;
 }
 
+#gallery_images {
+padding:10px 5px;
+}