Merge branch 'ui' of 93.90.177.129:zathura into ui

Conflicts:
	zathura.c
This commit is contained in:
Moritz Lipp 2009-12-26 14:48:10 +01:00
commit 4b15dbc003

Diff content is not available