chiark / gitweb /
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)
commita43734b169c24f87ed5f1192cead8273fbee10bf
treea390da0e2417670f37e49e9cf7d28ddf84592e31
parenta482b37a580aa0690450c7b08344c80864632ad5
parentd95aba9e06d73fce70c8ecb543d03caba014d501
Merge remote-tracking branch 'upstream/master'

Conflicts:
metadata/org.jmoyer.NotificationPlus.txt