updates
Merge branch 'master' of github.com:znmeb/CompJournoStick

Conflicts:
	Docs/Packages/FlightCrew.yuminfo
	Docs/Packages/GREYCstoration-gimp.yuminfo
	Docs/Packages/GREYCstoration.yuminfo
	Docs/Packages/ImageMagick.yuminfo
	Docs/Packages/R-core.yuminfo
	Docs/Packages/R-java.yuminfo
	Docs/Packages/R.yuminfo
	Docs/Packages/aajohan-comfortaa-fonts.yuminfo
	Docs/Packages/adobe-source-sans-pro-fonts.yuminfo
	Docs/Packages/aria2.yuminfo
	Docs/Packages/artha.yuminfo
	Docs/Packages/audacity.yuminfo
	Docs/Packages/bitlbee-otr.yuminfo
	Docs/Packages/bitlbee.yuminfo
	Docs/Packages/blender.yuminfo
	Docs/Packages/bluefish.yuminfo
	Docs/Packages/bwidget.yuminfo
	Docs/Packages/calibre.yuminfo
	Docs/Packages/cmyktool.yuminfo
	Docs/Packages/colord-extra-profiles.yuminfo
	Docs/Packages/createrepo.yuminfo
	Docs/Packages/darktable.yuminfo
	Docs/Packages/dia.yuminfo
	Docs/Packages/entangle.yuminfo
	Docs/Packages/evince.yuminfo
	Docs/Packages/filezilla.yuminfo
	Docs/Packages/firefox.yuminfo
	Docs/Packages/font-manager.yuminfo
	Docs/Packages/fontforge.yuminfo
	Docs/Packages/ggobi.yuminfo
	Docs/Packages/gimp-data-extras.yuminfo
	Docs/Packages/gimp-fourier-plugin.yuminfo
	Docs/Packages/gimp-help-browser.yuminfo
	Docs/Packages/gimp-help.yuminfo
	Docs/Packages/gimp-lqr-plugin.yuminfo
	Docs/Packages/gimp-resynthesizer.yuminfo
	Docs/Packages/gimp.yuminfo
	Docs/Packages/git-all.yuminfo
	Docs/Packages/gnome-classic-session.yuminfo
	Docs/Packages/gnome-terminal.yuminfo
	Docs/Packages/gnote.yuminfo
	Docs/Packages/gpick.yuminfo
	Docs/Packages/gtk-recordmydesktop.yuminfo
	Docs/Packages/hugin.yuminfo
	Docs/Packages/icedtea-web.yuminfo
	Docs/Packages/inkscape.yuminfo
	Docs/Packages/irssi-otr.yuminfo
	Docs/Packages/irssi.yuminfo
	Docs/Packages/isomd5sum.yuminfo
	Docs/Packages/kernel-tools.yuminfo
	Docs/Packages/lato-fonts.yuminfo
	Docs/Packages/libvirt.yuminfo
	Docs/Packages/livecd-tools.yuminfo
	Docs/Packages/liveusb-creator.yuminfo
	Docs/Packages/lynx.yuminfo
	Docs/Packages/lyx.yuminfo
	Docs/Packages/mypaint.yuminfo
	Docs/Packages/nautilus-image-converter.yuminfo
	Docs/Packages/ntp.yuminfo
	Docs/Packages/open-vm-tools-desktop.yuminfo
	Docs/Packages/open-vm-tools.yuminfo
	Docs/Packages/optipng.yuminfo
	Docs/Packages/overpass-fonts.yuminfo
	Docs/Packages/pandoc-pdf.yuminfo
	Docs/Packages/pandoc.yuminfo
	Docs/Packages/pdfshuffler.yuminfo
	Docs/Packages/perl-Browser-Open.yuminfo
	Docs/Packages/perl-CPAN.yuminfo
	Docs/Packages/perl-Hash-Flatten.yuminfo
	Docs/Packages/perl-JSON.yuminfo
	Docs/Packages/perl-Module-Build-Tiny.yuminfo
	Docs/Packages/perl-Net-Twitter.yuminfo
	Docs/Packages/perl-YAML.yuminfo
	Docs/Packages/perl-local-lib.yuminfo
	Docs/Packages/pidgin-otr.yuminfo
	Docs/Packages/pidgin.yuminfo
	Docs/Packages/pitivi.yuminfo
	Docs/Packages/powertop.yuminfo
	Docs/Packages/python-nltk.yuminfo
	Docs/Packages/qemu-kvm.yuminfo
	Docs/Packages/qtwebkit.yuminfo
	Docs/Packages/sane-backends-drivers-scanners.yuminfo
	Docs/Packages/scribus.yuminfo
	Docs/Packages/shotwell.yuminfo
	Docs/Packages/sigil.yuminfo
	Docs/Packages/spin-kickstarts.yuminfo
	Docs/Packages/synfig.yuminfo
	Docs/Packages/synfigstudio.yuminfo
	Docs/Packages/tor.yuminfo
	Docs/Packages/unixODBC-gui-qt.yuminfo
	Docs/Packages/unixODBC.yuminfo
	Docs/Packages/vidalia.yuminfo
	Docs/Packages/vim-X11.yuminfo
	Docs/Packages/vim-enhanced.yuminfo
	Docs/Packages/virt-install.yuminfo
	Docs/Packages/virt-manager.yuminfo
	Docs/Packages/virt-viewer.yuminfo
	Docs/Packages/wget.yuminfo
	Docs/Packages/wordnet-browser.yuminfo
	Docs/Packages/wordnet-doc.yuminfo
	Docs/Packages/wordnet.yuminfo
	Docs/Packages/xchat-otr.yuminfo
	Docs/Packages/xchat.yuminfo
	Docs/Packages/xournal.yuminfo
	Docs/Packages/xsane-gimp.yuminfo
	Docs/Packages/yum-plugin-fastestmirror.yuminfo
	Docs/Packages/yumex.yuminfo