Merge branch 'updatenotifs' into dev
authorLéo Flaventin Hauchecorne <hl037.prog@gmail.com>
Tue, 11 Jun 2013 01:40:59 +0000 (03:40 +0200)
committerLéo Flaventin Hauchecorne <hl037.prog@gmail.com>
Tue, 11 Jun 2013 01:40:59 +0000 (03:40 +0200)
commitb710062b5150e1b8cfe82bcb4ef029fe2f5d3b57
tree9ea525a9f3b1de9e7862665246e48ffb930020c2
parent5a0d8ee2450815b1f9bd749bd9640c09350c42d3
parentbd1d1545f238d9a41aced8822d091444998e6adf
Merge branch 'updatenotifs' into dev
.gitignore