Merge branch 'rebase-p-first-parent' into devel
commitc2ab1aa371c9256e8315301fea684344bef44ff7
authorJohannes Sixt <j6t@kdbg.org>
Tue, 10 Nov 2015 09:12:27 +0000 (10 10:12 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Tue, 10 Nov 2015 09:12:27 +0000 (10 10:12 +0100)
tree937d68d1f6421a4c3b7959feba2b11c73bf1c0ce
parent729dafc107b7ecb546277d2e124af8896bf8a91d
parentec459c0e72ae0655516c8b4d525718cf03707740
Merge branch 'rebase-p-first-parent' into devel