Merge remote-tracking branch 'original/master'
authorCristian Morales Vega <reddwarf@opensuse.org>
Tue, 13 Nov 2012 20:16:03 +0000 (20:16 +0000)
committerCristian Morales Vega <reddwarf@opensuse.org>
Tue, 13 Nov 2012 20:16:03 +0000 (20:16 +0000)
commitfdd65a4d3389bf2caf7554173430834b8ea82cf8
treea57d9f43371c068a2559b0a58f338bbaed1278a6
parent8c204e13096e219c0d737930f8d58cd26a0c1092
parent2823a289676eafb3868f5a596f26d1a3b30121ad
Merge remote-tracking branch 'original/master'
etc/xdg/menus/applications.menu