commit aeb2e6c809e6eadd2f0fb917fcbc19ae6dbb0d8d
Merge: dac36c0 572ed69
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Thu Oct 13 23:45:24 2011 +0100
fix merge
.gitignore | 1 +
meego-panel-people.spec | 59 ++++++++++++++++++++++++----------------------
sources | 2 +-
3 files changed, 33 insertions(+), 29 deletions(-)
---