Skip to content
Commit 5405f96a authored by Sylvain Boily's avatar Sylvain Boily
Browse files

Merge commit 'refs/merge-requests/4' of... 

Merge commit 'refs/merge-requests/4' of git://gitorious.org/xivo/xivo-provd-plugins into merge-requests/4
parents bdbe985a f33c6fd7
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment