projects
/
sitarba.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
b182060
a585f31
)
Merge branch 'rename'
author
Stefan Huber <shuber2@gmx.at>
Tue, 22 May 2012 07:25:32 +0000
(09:25 +0200)
committer
Stefan Huber <shuber2@gmx.at>
Tue, 22 May 2012 07:25:32 +0000
(09:25 +0200)
Conflicts:
sitarba
Trivial merge