summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-08-08 09:33:13 +0000
committerintrigeri <intrigeri@boum.org>2016-08-08 09:33:13 +0000
commit48cecff02f11f5a95f30f9e93315d68537a88d9c (patch)
tree3fb4251faaf88ee88683adf3adc00c7b36a92579
parenta10a304d686c890d19b37a3083aeb12db3296231 (diff)
parentd5e8c3810953c10cc56a2689840c9faf6bc3f61e (diff)
parent2df6d2714d1be07a5179785dd3baaafd29e66fc9 (diff)
Merge branches 'feature/10298-linux-4.x-aufs-kaslr' and 'feature/10190-OpenPGP-applet-from-Debian' into feature/from-intrigeri-for-2.6