[Pkg-mozext-commits] [all-in-one-sidebar] 04/05: Merge remote-tracking branch 'origin/version/v0.7.25'

[David Prévot]

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

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

commit c01c53a4ffc1c9661fef1da79cd5f60791e73f91
Merge: 3cd0c3f 2376eb3
Author: Ingo Wennemaring <github at addonlab.com>
Date:   Wed Sep 24 11:30:42 2014 +0200

    Merge remote-tracking branch 'origin/version/v0.7.25'
    
    Conflicts:
    	install.rdf

 content/_helper.js  |  8 --------
 content/aios.js     |  6 ------
 content/aios.xul    | 10 +++++-----
 content/aios_old.js | 15 ---------------
 content/aios_tbx.js | 27 ---------------------------
 content/pageinfo.js |  3 ---
 install.rdf         |  4 ++--
 7 files changed, 7 insertions(+), 66 deletions(-)


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