Merge branch 'master' into elisp
authorVasilij Schneidermann <v.schneidermann@gmail.com>
Wed, 2 Mar 2016 00:01:43 +0000 (01:01 +0100)
committerVasilij Schneidermann <v.schneidermann@gmail.com>
Wed, 2 Mar 2016 00:01:43 +0000 (01:01 +0100)
commit671c0e1c72264017465f937b6663f2e7469131fe
treee16689560672a397d979d003ee273cdeb183bb25
parentbded5e7f64ec960c6b0fd17e8627ff0a44e172df
parent0901c8b3872db55e169df265e63f512cfc8fa63a
Merge branch 'master' into elisp
Makefile