Merge branch 'master' of github.com:sixtyfive/geeqie
authorJ. R. Schmid <jrs+git@weitnahbei.de>
Sat, 11 Mar 2017 13:50:08 +0000 (14:50 +0100)
committerJ. R. Schmid <jrs+git@weitnahbei.de>
Sat, 11 Mar 2017 13:50:08 +0000 (14:50 +0100)
commit6b03a6143c0f3446973d473f91efd88259707327
treec8759bd76fd4da4f67c8a03d19bd3c6594cdff67
parent09258d881beb8119e5ab61ab880f707971c0a4b5
parenta427009441f87cac3d722fade36c6fffe6030328
Merge branch 'master' of github.com:sixtyfive/geeqie