acc history
Merge branch 'master' of github.com:libjournaldev/libjournal

Conflicts:
	src/LibJournal.pro