Merge branches 'login_img' and 'switch'
authorJoey Schulze <joey@infodrom.org>
Thu, 4 Oct 2012 21:08:13 +0000 (23:08 +0200)
committerJoey Schulze <joey@infodrom.org>
Thu, 4 Oct 2012 21:08:13 +0000 (23:08 +0200)
login_img: Calculate login image height via JavaScript
switch: Allow hiding of edit form column


Trivial merge