[Pkg-mozext-commits] [tabmixplus] 02/03: Merge with default

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to tag 0.4.1.2.02
in repository tabmixplus.

commit b1f1bb77fc7fa9a3e77991cd94afaf4034b1b20e
Merge: 68dc37a 8532194
Author: onemen <tabmix.onemen at gmail.com>
Date:   Thu Oct 31 08:58:51 2013 -0700

    Merge with default

 .hgtags                           |  3 ++-
 chrome/content/links/setup.js     |  9 ++++++++-
 chrome/content/session/session.js | 37 +++++++++++++++++++++++++++++--------
 3 files changed, 39 insertions(+), 10 deletions(-)

diff --cc .hgtags
index f4bac62,39363cd..70efadd
--- a/.hgtags
+++ b/.hgtags
@@@ -76,6 -66,5 +76,7 @@@ afa80c359096319ca0a1485c9db1bdf319b2346
  92d768b20d873dd7ad5cdbd6cb7a35800f69ff93 0.4.1.2pre.131006a2
  21844fdee0ea7a58ca18b3b5e80895a949ffadb6 0.4.1.2pre.131013a1
  35541fe3520a027b85ef8c83e43c18f81434e0fc 0.4.1.2pre.131019a1
- 90e4e89a57cd4a20ce9eb346895da64d552332eb 0.4.1.2
  7f45ed652be2fd217521b57d0eb1f86b340d2d3b 0.4.1.2pre.131019a2
++90e4e89a57cd4a20ce9eb346895da64d552332eb 0.4.1.2
 +558e76304a1dbbeedc0fe35dd20f57b110b6f6af 0.4.1.2.01
+ d7e8799c8f2620ef20c33dc5d25b39a2dd0cba2c 0.4.1.3pre.131027a3

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git