In the future please always rebase your commits to master. That way we avoid these annoying messages.

git pull --rebase

is a nice trick! :)


On Tue, Jun 4, 2013 at 2:56 AM, David E. Narváez <david.narvaez@computer.org> wrote:
Git commit 0fbee66feae2efd5d2d99128b7e40f8b4b22e038 by David E. Narváez.
Committed on 03/06/2013 at 23:26.
Pushed by narvaez into branch 'master'.

Merge branch 'master' of git.kde.org:nepomuk-core


http://commits.kde.org/nepomuk-core/0fbee66feae2efd5d2d99128b7e40f8b4b22e038