projects / diaspy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3eaa60 6c416e8)
Merge branch 'streams' into people
authorMarek Marecki <triviuss@gmail.com>
Fri, 3 May 2013 19:21:22 +0000 (21:21 +0200)
committerMarek Marecki <triviuss@gmail.com>
Fri, 3 May 2013 19:21:22 +0000 (21:21 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.