Merge with mainline

This commit is contained in:
Antoine Nguyen
2012-03-19 15:22:12 +01:00
23 changed files with 2032 additions and 598 deletions
+1 -1
View File
@@ -229,7 +229,7 @@ div.right {
.logo {
float: right;
/*margin: 5px 0 0 5px;*/
height: 90px;
height: 80px;
}
.dropdown {