commit a92ea55b99a7ba5cb737dff0c46fc36e63c737ee
Merge: fdc01f4 1151e9f
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Mon Jun 13 02:13:39 2011 +0200
Merge branch 'master'
.gitignore | 5 +++--
kaffeine.spec | 34 +++++++++++++++++++++++++---------
sources | 3 +--
3 files changed, 29 insertions(+), 13 deletions(-)
---