hg graft commit "Added temporary custom timer entry to the menu"
hg graft commit "Cleaner menu structure, nicer custom entry field"
update translations
update translations
hg graft commit "Added temporary custom timer entry to the menu"
rebased to master
hg graft commit "Cleaner menu structure, nicer custom entry field"
Merge branch 'quick-timer' of https://github.com/oleid/gnome-shell-teatime into quick-timer

Conflicts:
	po/TeaTime.pot
	po/de.po
	src/extension.js