[dasher: 51/217] Merge branch 'master' of https://github.com/ipomoena/dasher

[Patrick Welche <pwelche src gnome org>]

commit 6f6612caae9fcb1aef3bee30c4c27dfd35f0210b
Merge: 0552ec4 1c1fb2c
Author: ipomoena <amajorek google com>
Date:   Sat Oct 3 20:58:38 2015 -0700

    Merge branch 'master' of https://github.com/ipomoena/dasher

 Src/Gtk2/DasherControl.cpp |    6 ++++++
 Src/Gtk2/DasherControl.h   |    1 +
 2 files changed, 7 insertions(+), 0 deletions(-)
---