Merge branch 'epoxy' into epoxy
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 18 Mar 2014 23:21:54 +0000 (00:21 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 18 Mar 2014 23:21:54 +0000 (00:21 +0100)
commit926348692a4138e9c88f49ef43657dedb5f36897
tree14197689a92a8de2f2a376c5455232f53639ccb1
parentee7863d9cdd683dd4df9d6463d98dc59182c54fe
parent144496bf79000c3971090195fbfedcb2cb22a0be
Merge branch 'epoxy' into epoxy

Conflicts:
Makefile.in
movit.pc.in
Makefile.in