Merge branch 'hush_shell_restore'
authorPiotr Dymacz <pepe2k@gmail.com>
Thu, 20 Mar 2014 10:31:03 +0000 (11:31 +0100)
committerPiotr Dymacz <pepe2k@gmail.com>
Thu, 20 Mar 2014 10:31:03 +0000 (11:31 +0100)

Trivial merge