]> git.sur5r.net Git - ngadmin/commit - lib/src/session.c
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)
commitf1820d27fcc160825c093a6e2e4fe2c39f269303
treefa1101e18d5ba9fe500900fa774d23c4a10a5c23
parent198b1f14719df79df1a9b3e628b0a58f4e1fdb69
parent44bf635e97f3053b97f7485e3206d5501cc88c57
Merge remote-tracking branch 'upstream/master'

Conflicts:
lib/src/session.c