Merge branch 'master' of github.com:manjaro/pamac

Conflicts:
	src/manager_window.vala
This commit is contained in:
guinux 2014-12-30 15:10:12 +01:00
commit f40c8f2601

Diff Content Not Available