]> git.ipfire.org Git - thirdparty/snapper.git/commit
Merge remote-tracking branch 'upstream/master' 155/head
authorArvin Schnell <aschnell@suse.de>
Mon, 2 Mar 2015 16:46:32 +0000 (17:46 +0100)
committerArvin Schnell <aschnell@suse.de>
Mon, 2 Mar 2015 16:46:32 +0000 (17:46 +0100)
commitd071ff3f04ae4b14728336d0aedc9ede79a89aef
tree6465bf8686d8b0330fa4d35f92b1a3c4404bd324
parent68269bd0418138887d2e8acad2bd87021f20a80d
parentaae057b337e5a1439a4ea95563b1db327c60bd6f
Merge remote-tracking branch 'upstream/master'

Conflicts:
data/Makefile.am