linuxcnc@arm:~/linuxcnc$ git log
commit b6885690fb82cb12c4019b0466c6320a6df34e9d
Merge: 32e92ac f4ddae2
Author: Michael Haberler <[email protected]>
Date:   Tue Dec 10 20:35:01 2013 +0100

    Merge branch 'ja4-master' into work

    Conflicts:
        TODO
        src/Makefile
        src/emc/motion/emcmotglb.c
        src/emc/motion/motion.c