[freeplane] 02/04: Merge tag 'upstream/1.2.23+dfsg1'

[Felix Natter]

This is an automated email from the git hooks/post-receive script.

fnatter-guest pushed a commit to branch master
in repository freeplane.

commit 0df37cc419518428df38c1cc7f9740b535d7abeb
Merge: d242e63 aee6396
Author: Felix Natter <fnatter at gmx.net>
Date:   Sat Jan 25 10:21:20 2014 +0100

    Merge tag 'upstream/1.2.23+dfsg1'
    
    Upstream version 1.2.23+dfsg1

 freeplane/resources/flash/flashobject.js     | 153 ---------------------------
 freeplane/resources/flash/visorFreeplane.swf | Bin 33956 -> 0 bytes
 2 files changed, 153 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/freeplane.git