~noskcaj/ubuntu/wily/epiphany-browser/merge

1
2
3
4
data/bme.desktop.in
data/epiphany.appdata.xml
data/epiphany.desktop.in
plugins/desktop-file/plugin.cpp