Merge tag 'v1.2.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 3 Mar 2015 16:57:36 +0000 (11:57 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 3 Mar 2015 16:57:36 +0000 (11:57 -0500)
commitb7c4b16b4a15bbab8c47a3dbb8f023019daab15f
tree535142b7e0660af83a60f40c987ac9df89efc553
parent751bf9c2eb7bec16f11eb64fc463ee2bb66e1504
parent555cf7e93e2fac194e7147d63c283a287ed93d19
Merge tag 'v1.2.2' into develop

v1.2.2