# HG changeset patch
# User Janos Kovacs <kovjanos@gmail.com>
# Date 1433262859 -3600
# Node ID e9d058f20097995072475bdb3c15dcb561a9b67e
# Parent  9b1b0b32e7d5cbcd3abb463dfca54a8d90e1ee1d# Parent  6d003c08bacd70c92e4737497c2a6ea9f7ae6eae
Merge default back to the new_screen_layout development branch