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)
commit1d61c2af09a471d5311a6f52ffd7b22a14aa1d18
tree7d1a42e725ecedb09b71566260a55b4adc8ce3b2
parent68f7258631f8b0a5262c7b0cd78cbf3807dc3fb5
parent080d6887b64bdf0c4a879ebb6ff70f6b2555f6be
Merge branch 'hush_shell_restore'