]> git.sur5r.net Git - ngadmin/commitdiff
projects / ngadmin / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 198b1f1 44bf635)
Merge remote-tracking branch 'upstream/master'
authorAlkorin <github@alkorin.fr>
Wed, 10 Sep 2014 06:37:38 +0000 (08:37 +0200)
committerAlkorin <github@alkorin.fr>
Wed, 10 Sep 2014 06:37:38 +0000 (08:37 +0200)
Conflicts:
lib/src/session.c


Trivial merge
TBA