[Pkg-mozext-commits] [all-in-one-sidebar] 02/09: Merge remote-tracking branch 'origin/development'

[David Prévot]

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

taffit pushed a commit to branch master
in repository all-in-one-sidebar.

commit 736206f383f5fe8e8d04bc1b561c196345429eb6
Merge: ac66275 9f4c385
Author: Ingo Wennemaring <github at addonlab.com>
Date:   Sun Jan 3 20:03:11 2016 +0100

    Merge remote-tracking branch 'origin/development'

 content/pageinfo.js          | 529 +++++++++++++++++++++++++------------------
 content/pageinfo.xul         |   6 -
 content/prefs/prefs.xul      |   2 +
 defaults/preferences/aios.js |   2 +-
 4 files changed, 312 insertions(+), 227 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/all-in-one-sidebar.git