]> git.ipfire.org Git - thirdparty/snapper.git/commit
Merge remote-tracking branch 'upstream/master' 198/head
authorArvin Schnell <aschnell@suse.de>
Tue, 22 Sep 2015 13:23:07 +0000 (15:23 +0200)
committerArvin Schnell <aschnell@suse.de>
Tue, 22 Sep 2015 13:23:07 +0000 (15:23 +0200)
commitf5842a508496587f571f95640737bcb9f26e0a01
tree3effe1fda16088f20956babdd4f08aee6ecb6e93
parenta80b55b4014fb0d068b2b34b82e8159a305394da
parent736a3d04af2126d81abec4c94e3abf0d84a61625
Merge remote-tracking branch 'upstream/master'

Conflicts:
package/snapper.changes
package/snapper.changes