2014-07-14: merge stable into default.

merge stable into default.

diff --git a/.hgsigs b/.hgsigs
--- a/.hgsigs
+++ b/.hgsigs
@@ -8,3 +8,4 @@ 1d95b99da08b25917847702a382c691b5bd1de69
 a41ca7bf033667a8dfeacd48be5caf315fabb020 0 iJwEAAEIAAYFAlL2Z+gACgkQ3M8NswvBBUisDgQAiHKSfcOdlWoin7wpHDVlyKhAxAIg5D9xwAGDj2CIVEu4cpw5HdZ8t8fjyrP6lMsAkHnCVNUlRjprdo7PR4al1uxNmz4H0mQMlDLxG4Sfj2x01w3DDgiNOfV/65lwNY9BNxULCjwBlHN5qzv9toLwZ29SLEZXvshuZBxe8qSfBy8=
 a2ae0f4d637ff5d615acc91d82d21259b0ec3b94 0 iJwEAAEIAAYFAlMJPXwACgkQ3M8NswvBBUjSEAP/bvPcy52p1mq4LuEkYxvj3UYnknT6g3yDCCXNEa2vuy6rkekZvbl6h9U2/FM37JEw2sgeqcp2P7epJzlxSpd9jIH+5/xT7R1FViOibLBumZ/5cQoMsthQyyrB2NhQbxtUf6fH5TnqZU/z9jdAZqBLABNaNeufetjGXbYmn4W7zk4=
 4e9a5aef2eb1307e082d4536afa5d4f47840b6ec 0 iQEcBAABAgAGBQJTIGw4AAoJEFyD82SnDaCeQw4IAKt5CZS8Jx4qyL3Zb8z0xjop461uDnEXyg0m+QL2fUgv3kpsZM5CqgZRm8mF3bnRTtmPwwvtD+mjkz+xCUhAWkqCMH+VusLnwfVAeOxAAvvXT+z8quh/Xt9qZ8J8VaWh6L1CrYl8xJFDJlymCe/2pcOn9OnWF3QeNuLswWllebGRXFHpeUs+JZKVxXhwSyGnfKOiboXfpkrW4VoyCuWR4Mz/KczohAj8dZYhD+gRjTUGLS64TJbaevmTnffexgqvM3KYj8hvwx4m1Iz95QLxcb09fRA9BoRPNvaOHUNMsPSlpoDEMI/pBBfWx0ALadaYTmJvG/jGeyYDCWQMAXUjMIs=
+a321c87fec27f184407da6a410c482a944074b7e 0 iQEcBAABAgAGBQJTw8CwAAoJEFyD82SnDaCeb/sH/374MNTwjx2LqBDAaK0jMHsFabm1/vZ99hlzNo0d7TPbl6/KkeicnluTpB+HVYtssMwHEFGiIWAY1xmX3rZKrYDpvCr2r15UZqqtyyeJxdDkqTQfsI7qwQy4FhZAfI9o948zYQ3z32TtsjPoyS6JDRZ1D0rBcU8/+K9AaYwl3QVsyxuvVwJK2Wb/Afn8CbG8xn0JtGNRbosfAAcgQDnV4MqA1p5MSDX3UaImWuVuBM9ejIvcyiBXxpwUb2DiEfFF8agsJoHQ/Vjy1j+IPE/mIa6nfV9I4Czb9wpItDXJe56wrsmGHEVVstnzys4DPiEWH57tG+iFgHXuw3gBJfySi2g=
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -16,3 +16,4 @@ bb1c4165b8a6d12929625e6518a5b1c727c75942
 0e1335f015a83c6c6616019189c665b3849269ce v0.5.10
 07ec05365e84d29d24ce5f476654f9542931ed2d v0.5.11
 9af37e8efa7a2674caec07c7d2339f136f380d37 wisp-mode-0.2
+5475d743562512c44d2cdd0bf534c78c88efb0f8 v0.6.0