Merge branch 'work'
authoralexis <alexis.bory@gmail.com>
Sat, 1 Dec 2012 17:25:36 +0000 (18:25 +0100)
committeralexis <alexis.bory@gmail.com>
Sat, 1 Dec 2012 17:25:36 +0000 (18:25 +0100)
commitdf57c13525c2f36e931ef5f414a90aa353c3477b
treeb1775492e5a53ec62509354b86c933d169e9796d
parentdb4f97e53cb2aab1b76286b96a15271b69a50b13
parent02cf1c0109eae57e068e1c37c7cc7304614988c5
Merge branch 'work'