projects / skytools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dde487b 5ba2373)
Merge remote-tracking branch 'gamato/master'
authorMarko Kreen <markokr@gmail.com>
Fri, 4 Oct 2013 12:37:05 +0000 (15:37 +0300)
committerMarko Kreen <markokr@gmail.com>
Fri, 4 Oct 2013 12:37:05 +0000 (15:37 +0300)
Conflicts:
debian/changelog


Trivial merge
Skytools master repo.