Added, netbeans projecty files
Updated headers in the .pot file
Add fr_FR translations
Merge pull request #72 from oaubert/fr_translation

Add fr_FR translations
Add Olivier Aubert in much-appreciated contributors
Merge branch 'master' into 1.4.x
sl_SL translation
Merge pull request #74 from sebastjanm/1.4.x

sl_SL translation
Merge pull request #71 from oaubert/master

Fix for non-pulseaudio systems
Merge branch '1.4.x'
added screencapture as bin

Conflicts:
	galicaster/classui/confui.py
forcing formats and caps since we don't like freedom. seriously: x264enc is to picky to be practical here
add plugin to reingest recordings where the ingest has failed.
Update CHANGELOG with 1.4.x
Merge branch '1.4.x'
Merge pull request #76 from ppettit/f/retryingest

Add plugin to reingest recordings where the ingest has failed.
Merge branch 'master' of https://github.com/teltek/Galicaster
Merge pull request #75 from uib/screengrab

New screen device module to record a screenshot video stream.
update CHANGELOG with new future features
Merge branch '1.4.x' of https://github.com/teltek/Galicaster into 1.4.x