Merge remote-tracking branch 'upstream/master'
authorTovok7 <Tovok7@gmx.de>
Mon, 16 Jan 2012 01:17:07 +0000 (02:17 +0100)
committerTovok7 <Tovok7@gmx.de>
Mon, 16 Jan 2012 01:17:07 +0000 (02:17 +0100)
commitafdc2b667fbd8880daf2af40a75ce0333ee9a544
tree7677205c5e4004cb116d2e61d2fe774953b27dc6
parente0f3db48b434061936882f0dcc80cb5017eb17c2
parentd73762354e33a4a0342d081eeff420746bd0bf38
Merge remote-tracking branch 'upstream/master'

Conflicts:
metadata/org.jmoyer.NotificationPlus.txt