Commit graph

39 commits

Author SHA1 Message Date
Max Schenkelberg
d85fd52c26 Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values.
Amend: Added comments and cleaned up preference store

Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d

Former-commit-id: dbc6cc3fc6 [formerly 59434c8a60] [formerly a01a6d68d0] [formerly cbf8b9249c [formerly a01a6d68d0 [formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]]
Former-commit-id: cbf8b9249c
Former-commit-id: d886f6a0f4f81e75f3b006fbf72cebc9033f58c2 [formerly 654da3c0a2]
Former-commit-id: 39e1c4fa46
2014-03-04 09:23:36 -06:00
Mike Duff
6c5c943a5e Issue #2632 - Implement buddy pounce (Contact Notifiers)
Review comments

Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7

Former-commit-id: 512e634a97 [formerly 377c1f9998] [formerly 5440ff64d1] [formerly 5f433b4f6b [formerly 5440ff64d1 [formerly 8ece6e53095ee80d7d4baa249125b3fe7a03add7]]]
Former-commit-id: 5f433b4f6b
Former-commit-id: 0494775290c2982f78ac45adef680a21db012453 [formerly ee06fc58b5]
Former-commit-id: 63fc5f8c66
2014-02-28 13:23:34 -06:00
Mike Duff
5754117aad Issue #2631 - Set preference defaults in the Activator.
Removed unused file.

Change-Id: Idd6fee39cae4cc8d4cf4cd2ae652ed0722d6cd2e

Former-commit-id: 9eafacaac2 [formerly a96a833f51] [formerly ed5cb91406] [formerly a7b1e79d2d [formerly ed5cb91406 [formerly 61e803bb38b398fd6758d650b6120dc2514064b4]]]
Former-commit-id: a7b1e79d2d
Former-commit-id: 054cdc944f74842daa02964eb9d5d80d21f23654 [formerly d90f4495c2]
Former-commit-id: f98eec12b9
2014-02-20 15:09:10 -06:00
Brian Clements
e7584f3a49 Issue #2751 collab menu icons, fixed NPE
new icons for change color and transfer leader menu items
fixed NPE when cancelling change color dialog


Former-commit-id: 8bbf2bb6bd [formerly a2bdfa25cc] [formerly aaa2de20f4] [formerly 89a48c3f6b [formerly aaa2de20f4 [formerly 71c13c7a24fb4c3d7556d30ae35a3633b74f7bb3]]]
Former-commit-id: 89a48c3f6b
Former-commit-id: 5cc63f048c2ca2bae92c62e08c20b8a3fc4c7681 [formerly 4b7ba54dc3]
Former-commit-id: 04697836b8
2014-02-20 11:50:54 -06:00
Brian Clements
08a0e5baf2 Issue #2751 implemented room/topic ownership transfer
Former-commit-id: 4e165aba58 [formerly a8ff1effc1] [formerly c3cadff705] [formerly ab72938246 [formerly c3cadff705 [formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]]]
Former-commit-id: ab72938246
Former-commit-id: d96f62f0208dbdcb69677a9d6b014fc0a7761a39 [formerly d9ac2c0037]
Former-commit-id: 9d00fe2bab
2014-02-20 11:10:14 -06:00
Nate Jensen
eeac24c773 Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
Former-commit-id: f545a8a74d [formerly a241472c34] [formerly df376abcb7] [formerly f99cf7df47 [formerly df376abcb7 [formerly ff080a6b5184f486348a015f31b957325fa280fa]]]
Former-commit-id: f99cf7df47
Former-commit-id: 76b7d9b753824f510f6d112e0bfada581f946906 [formerly 8b152a8027]
Former-commit-id: d3ec0da1bb
2014-02-19 16:19:27 -06:00
Mike Duff
a723f69ad9 Issue #2631 - Add sound preference for users joining a room.
review comments

Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207

Former-commit-id: 659cb1f2a0 [formerly e2a6251a6b] [formerly 663ea8decd] [formerly 95fcee385a [formerly 663ea8decd [formerly f578e45e37f7ac0780d2dc6b6ea21e81630ddc78]]]
Former-commit-id: 95fcee385a
Former-commit-id: 280611ef49d0a886c12f13b5471242ae42c55bac [formerly 3100a71f34]
Former-commit-id: 89c4a3e04b
2014-02-19 15:26:14 -06:00
Brian Clements
30027665ac Issue #2751 fixed chat room bugs
fixed history messages having incorrect 'from' type
added ignore to dispose messages after room is closed
renamed tool tip for userid to match how JIDs are labled in client


Former-commit-id: abc01f5475 [formerly 06c16118e1] [formerly 73ae2145ee1dd7c24b67f28a479521c8624012a8 [formerly dc074a9650]] [formerly 3a135b8eac [formerly dc074a9650 [formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]]]
Former-commit-id: 3a135b8eac
Former-commit-id: 7c130f893c124249133b51cb750375f7ea62663d [formerly bee7cdb71a]
Former-commit-id: 77bb396c9a
2014-02-19 08:32:26 -06:00
Brian Clements
f5a25c9030 Issue #2751 fixed blocked icon for roster entries
previous refactor broke type check for blocked icon logic
moved blocked icon logic to subclass that handles roster tree labels


Former-commit-id: ab8f47413f [formerly e894019715] [formerly a94b366e26] [formerly 3307f5ea5e [formerly a94b366e26 [formerly 7f3a2f5e631176426ece6384719f3b1c9b00105a]]]
Former-commit-id: 3307f5ea5e
Former-commit-id: 0a4ca2ccc03c0b3bc7d6e3a7885088347d34525e [formerly 476d0c3257]
Former-commit-id: 02d3a9ae7e
2014-02-17 17:11:36 -06:00
Nate Jensen
740e71adba Issue #2751 first cut of transfer leadership
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9

Former-commit-id: 47b27c602f [formerly 63d5f94cbb] [formerly e05f1eae96] [formerly a85575a763 [formerly e05f1eae96 [formerly cd0a838d34c9d7533bf59a477a17f4cb1af75a00]]]
Former-commit-id: a85575a763
Former-commit-id: 759372ba16bb02e06f0e8472c362cf3299be0ff5 [formerly 11fb06810f]
Former-commit-id: 139479b4e1
2014-02-13 15:35:53 -06:00
Nate Jensen
2772ad3c9c Merge "Issue #2700 fixed subscribe request group input" into development
Former-commit-id: ec6d8585e1 [formerly f2b32fa1ae] [formerly 2643d01b74] [formerly d8e2d2837e [formerly 2643d01b74 [formerly af0e70e20c2a5ca276e9b819285d34c0113cafe7]]]
Former-commit-id: d8e2d2837e
Former-commit-id: e7dc3b65fcb3fa03216ea4dfccc11e35d47a79ef [formerly b31470f7e3]
Former-commit-id: 1f3c4090a0
2014-02-13 14:02:55 -06:00
Brian Clements
21b1a6844a Issue #2751 user identity refactor
VenueParticipant no longer a subtype of UserId
New interface for both
refactored base classes to be generic for user types


Former-commit-id: 01653c76de [formerly 16ed18e0c6] [formerly ef52908906] [formerly 0ac7ff81cf [formerly ef52908906 [formerly e91ae6eacf4af9e25afc213c3cd0c269c8d465f4]]]
Former-commit-id: 0ac7ff81cf
Former-commit-id: 01dac7e88270bd83aeb03bd3e6b701e82c5f1b0b [formerly 3ec3ad0543]
Former-commit-id: e6de3a118d
2014-02-13 13:51:39 -06:00
Brian Clements
d4afb01ecc Issue #2700 fixed subscribe request group input
user was being added to roster twice, the second time overwrote the group info
changed dialog to pass group info back so we only add once


Former-commit-id: a0eb8342bf [formerly 2d72c0f475] [formerly 37ddac11b88e84a017f079fd9dbf2ff4de856e68 [formerly 579f7c826d]] [formerly caa8360ac7 [formerly 579f7c826d [formerly 0c4a7915870f374cb4e728303939335cb0691c84]]]
Former-commit-id: caa8360ac7
Former-commit-id: 68affea48bc5b76e4b2afb6e939f8ab5903347db [formerly bafe2972a4]
Former-commit-id: 46ea69990d
2014-02-13 09:47:02 -06:00
Brian Clements
0145571fe4 Issue #2799 fixed double click chat not working for roster entries
Former-commit-id: 2a687e7ac5 [formerly 1e19c8d62c] [formerly 1bf3a09056] [formerly 9d7490a158 [formerly 1bf3a09056 [formerly 06cfbcccff89fd79efd3188c45653dce160fc90a]]]
Former-commit-id: 9d7490a158
Former-commit-id: 4759fd1ad623c2d68120a23d29513e3f9b15ecd5 [formerly f22268295e]
Former-commit-id: 667a1450cf
2014-02-12 17:06:44 -06:00
Brian Clements
8b275e94b2 Issue #2699 require non blank handle
previously defaulted to userid if handle left blank
now reprompts for handle
preferences now default to userid to pre-fill handle


Former-commit-id: 88db377b41 [formerly 8f07ae2a42] [formerly 0765451a9d] [formerly ddf5b2a3ef [formerly 0765451a9d [formerly ae5f2d2b547241e7ba9c22aabaf64fceceb1b563]]]
Former-commit-id: ddf5b2a3ef
Former-commit-id: f1871690aa5457b126ba46efaeed7a47b128ed69 [formerly fab4fea177]
Former-commit-id: 9c67bcbbcf
2014-02-12 09:13:48 -06:00
Brian Clements
0dd73fed5a Issue #2699 removed over cautious handle validation
xmpp does not limit the characters that can go in a handle
fixed id from room parsing to account for special characters


Former-commit-id: 6c6467d235 [formerly 639f774567] [formerly 7d6e116b9f] [formerly 6518b88fe5 [formerly 7d6e116b9f [formerly 24343a796d0089824dde2f7039cdf93ed0ebf88c]]]
Former-commit-id: 6518b88fe5
Former-commit-id: 8705994ebee4fa744b73413cf439e077ecb61c30 [formerly 8742be3a13]
Former-commit-id: 6efb4f51d2
2014-02-07 10:06:06 -06:00
Brian Clements
876b60e15d Issue #2699 fixed assumption that usersearch was exact
usersearch returns matches for any part of string
added method to restrict to exact matches only


Former-commit-id: ddbfe9a763 [formerly bebd62c6b6] [formerly cfa3c9e0e8] [formerly 6ea009a2e1 [formerly cfa3c9e0e8 [formerly 74daa7109149073c615d13c25092f6d08a77b936]]]
Former-commit-id: 6ea009a2e1
Former-commit-id: 32509d9365c50f4522e4f0eb5ec73059ee0d9acf [formerly aff354a3d7]
Former-commit-id: bc75d43bc3
2014-02-03 15:34:58 -06:00
Brian Clements
c6287ecffc Issue #2699 added handle config to prefs
default handle autofills session dialogs
is also used to connect to feed venue (error popup if already taken)


Former-commit-id: 83d6ca0855 [formerly 21c75d1d01] [formerly 1ff4ed1ae9] [formerly 16c1aaed3e [formerly 1ff4ed1ae9 [formerly f10f42753c541d4003b4c67a84a1d50e033941d3]]]
Former-commit-id: 16c1aaed3e
Former-commit-id: a84830a2b6c074a8c5eb328da49682053240a4cd [formerly 7c867338c8]
Former-commit-id: 2f60d1b579
2014-02-03 12:59:57 -06:00
Brian Clements
7678703ae0 Issue #2700 fixed subscribe back after contact request accept
we were sending the wrong presence type when accepting request
pidgin handled it, but it wasn't to the spec
fixed by adding contact to roster if not already a friend
request authorization dialog doesn't prompt for group if they are already in one


Former-commit-id: dc59e8fa2d [formerly 7176bf59b8] [formerly b88eaeb73e] [formerly b0402be1d3 [formerly b88eaeb73e [formerly 4d860337ea821975b6ddb4846f102199347a4dcc]]]
Former-commit-id: b0402be1d3
Former-commit-id: 49b91dbbac727f3af22f35a351ce544d8ce31b75 [formerly b651ada4b3]
Former-commit-id: 9210aae10a
2014-01-31 13:10:35 -06:00
Brian Clements
35b53a61cd Issue #2698 added handles to venues
venues now handle identity differently with VenueParticipant instead of UserId
fixed alias bug due to roster entry change


Former-commit-id: bd410b2529 [formerly 4e2cb3f7ae] [formerly 3e585945d6] [formerly 3250eb34f5 [formerly 3e585945d6 [formerly 9a8b011683ffe7194c48b1827d3a4f0ddf4f9627]]]
Former-commit-id: 3250eb34f5
Former-commit-id: 15ea8433323667869df6df396f6377d11f2a7079 [formerly 4f4d5c5d69]
Former-commit-id: 4190b13ae2
2014-01-31 09:44:31 -06:00
Brian Clements
a225d12692 Issue #2698 made sessions private and invite only
removed venue info because you can't get it for private rooms
improved error handling for existing room when attempting to create
fixed default compression config


Former-commit-id: 190400fc34 [formerly 1f1be20d41] [formerly c498307b30] [formerly 5b9f694930 [formerly c498307b30 [formerly 850cbc03ebea6f26ac7095abffe7729985c426c4]]]
Former-commit-id: 5b9f694930
Former-commit-id: ceb8a89c7f4c8cc41774e50c75969cbdacc6d919 [formerly 4a0682a9e8]
Former-commit-id: 07452b7778
2014-01-29 10:16:15 -06:00
Brian Clements
a2cc9001ae Issue #2700 added contact request dialog
user is now prompted to accept contact request
added support for managing contacts that haven't accepted contact requests
contacts list shows new icon for contacts that haven't accepted contact requests


Former-commit-id: aa642d5577 [formerly b4d930bcb9] [formerly 6b1843f19a] [formerly bd19366ada [formerly 6b1843f19a [formerly 8ad4c1674d2719a7781eb137669eb15212a1488c]]]
Former-commit-id: bd19366ada
Former-commit-id: aa6da3ca1e9307689f8365bc7178e584cb7032e6 [formerly f22052321b]
Former-commit-id: bffa4d84fe
2014-01-28 10:07:11 -06:00
Brian Clements
e2ca671173 Issue #2701 removed local groups from collaboration
added shared groups to represent groups managed by server
local group actions changed to modify roster groups
code cleanup on contacts manager including removing unneeded roster manager
update script to clean up localization files
removed ui option to create an empty group


Former-commit-id: fffb6aaf9a [formerly b86ad8ca6f] [formerly f615f2226f] [formerly 26ac549096 [formerly f615f2226f [formerly 06a9db4836fa2753a913e2314a8c003380416eac]]]
Former-commit-id: 26ac549096
Former-commit-id: beabd84fb816fcf8a5201927f1389915efb941f7 [formerly 8944860cbb]
Former-commit-id: cfe945d76b
2014-01-27 10:14:10 -06:00
Nate Jensen
c1e42e49e9 Merge "Issue #2630 added away timeout for collaboration inactivity" into development
Former-commit-id: 181994548e [formerly 8420f87348] [formerly 70fbdbfd0bcaaf3ddbadf5bfde88aa15020dae99 [formerly bdb4d8bdeb]] [formerly eafe61cd37 [formerly bdb4d8bdeb [formerly 14d419fdd187e4e1e537590e626ec33d3f5b071f]]]
Former-commit-id: eafe61cd37
Former-commit-id: 0bddc08432f572efd0ebc61e9e5e47a4becfcea3 [formerly 46dfbe9334]
Former-commit-id: 5504ec1efd
2014-01-15 13:48:13 -06:00
Brian Clements
998e8ca8c2 Issue #2630 added away timeout for collaboration inactivity
eclipse job in connection subscriber
preferences added to collaboration prefs page


Former-commit-id: b9c1e59353 [formerly 7e952c5ba8] [formerly 24190efb75] [formerly 57fb953b8d [formerly 24190efb75 [formerly c6fded1429e44033bb989c1d9caaac87c72eb440]]]
Former-commit-id: 57fb953b8d
Former-commit-id: e2a3bebef2dc240ed45242a0f8d5e55ec133f6ab [formerly 53273c4e5a]
Former-commit-id: 7410c36783
2014-01-15 13:20:25 -06:00
Brian Clements
46c751d7da Issue #2630 fixed status parsing bug
status from preference store wasn't being parsed correctly
changed connection data to store as Mode object instead of string
added parse method to collaboration utils


Former-commit-id: e3f615b2b7 [formerly 45b5df24d4] [formerly 79446d983b] [formerly bf6cf2f2ee [formerly 79446d983b [formerly 0176ba7963a5ff5bbd37b2e0867cbf97f4a3ef66]]]
Former-commit-id: bf6cf2f2ee
Former-commit-id: 053ba48475681c6ca6bde16071dbe1d6807e277a [formerly 1219713128]
Former-commit-id: bfbcbf382a
2014-01-15 10:24:09 -06:00
Brian Clements
9a28a4e067 Issue #2563 added user server add/remove functionality
now persists user entered servers to localization


Former-commit-id: 7279fbf6b3 [formerly af9292ea71] [formerly 487aa58778] [formerly c8cfc788f3 [formerly 487aa58778 [formerly 43fc94e9cc2a7f518971d509478f3b9a65588d19]]]
Former-commit-id: c8cfc788f3
Former-commit-id: a779f96749690d34c737ced63e146304783cc395 [formerly 0c5b0eaf69]
Former-commit-id: a8f746f794
2014-01-09 13:19:59 -06:00
Brian Clements
0193a9db0f Issue #2563 fixed default xmpp port
The default port for postgres was there by mistake


Former-commit-id: ea63496cc3 [formerly e08c5ea04c] [formerly e263cdb63a] [formerly dfcf6e9ade [formerly e263cdb63a [formerly c6e76f765aa6cbb50b238bb3d01de7fe365d150d]]]
Former-commit-id: dfcf6e9ade
Former-commit-id: 44850ca1b4681434bdd6bef977c019dc3e5fc792 [formerly 27b4ec6df6]
Former-commit-id: 373feec7f5
2014-01-07 10:52:50 -06:00
Brian Clements
bed3b77948 Issue #2563 modified server config parsing to allow for custom port
Replaced parsing code that assumed no colon in the server name, which prevented connecting to servers that didn't use the default XMPP port.


Former-commit-id: 9102b08053 [formerly 4f2aa49807] [formerly cea12a1a1d] [formerly b01e6f0c98 [formerly cea12a1a1d [formerly b995fe2036d4c0e26e25edd7f4bffd956d82921f]]]
Former-commit-id: b01e6f0c98
Former-commit-id: 4ae9dcc3fd65cda97138587d88156c3cc3a8281c [formerly d64d95d0c6]
Former-commit-id: 74c6fdc613
2014-01-06 14:14:38 -06:00
Brian Clements
95c30dbe0f Issue #2563 fixed label issue for non-grouped roster entry
the old code assumed that the username was populated in the roster object
new code uses the userId which is always populated


Former-commit-id: 0124fbd68d [formerly 0ce560149e] [formerly 73347283b6] [formerly d07bc465d4 [formerly 73347283b6 [formerly 5fe0f88b3465ba65efabe2a41d1df392c85e041f]]]
Former-commit-id: d07bc465d4
Former-commit-id: 59f71ff2ec1502a0ff12db79de7f3fc00a2159bd [formerly 0f4be44a23]
Former-commit-id: 5dcaa98110
2013-12-20 14:40:00 -06:00
Brian Clements
f084679410 Issue #2563 roster updates for stock servers
added functionality that makes the contact list compatible with server rosters that could be modified with other clients
added support for roster entries that aren't in a local or server group


Former-commit-id: b41eadd0be [formerly b120d74099] [formerly 2b8668a4eb] [formerly e4bd8a3e2c [formerly 2b8668a4eb [formerly 23d898308fb3aa673d85fdf00495d43e4c02a08f]]]
Former-commit-id: e4bd8a3e2c
Former-commit-id: 35a2c84384d4302036ad4c4d8408a681edbf9e81 [formerly 4b4c7ba50c]
Former-commit-id: 0882672686
2013-12-20 12:03:04 -06:00
Brian Clements
5dcd524fa1 Issue #2563 compatibility features for stock xmpp servers
added more listener handling for venue events and server disconnection
added capability to connect to a different server from UI
added better error messages for failed connection/login to server
fixed assumptions that server always sends HTTP url and has feed chatroom


Former-commit-id: 24b3713680 [formerly 621a8536e6] [formerly 09c0267237] [formerly af83c0cf87 [formerly 09c0267237 [formerly b3173727f3f685119be3668779eb5da7e075df50]]]
Former-commit-id: af83c0cf87
Former-commit-id: f24abb8dd24a72ce76ad2bc6b3b272f81b4d74ad [formerly 43021ae281]
Former-commit-id: 917d8dffee
2013-12-20 10:41:13 -06:00
Brian Clements
64dda165db Issue #2562 moved session data from chat to packet extension
delegated compression to smack
added timeout for http config
fixed getting all joined venues
fixed room invitation from non-cave client
create session checks for session name already used


Former-commit-id: c2b759b38e [formerly 2c20a87634] [formerly 80650337ce] [formerly ce0a34b53c [formerly 80650337ce [formerly 3781483ef6dd1889aa0ecd6ccc83bfb2461713b5]]]
Former-commit-id: ce0a34b53c
Former-commit-id: 698a51437531736c124a805026ea7ca5cd199699 [formerly 4015dc23ee]
Former-commit-id: d58f8d7134
2013-12-19 12:08:21 -06:00
Brian Clements
4d04f6edbf Issue #2561 removed ECF from collaboration
added smack 3.3.1 to cots
collaboration now uses smack directly for XMPP
moderate code cleanup on collaboration.comm
added double click to start chat in participant list


Former-commit-id: d0d14ec091 [formerly 5d1d44b60d] [formerly 8ece30944a] [formerly e6c4b39aca [formerly 8ece30944a [formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]]]
Former-commit-id: e6c4b39aca
Former-commit-id: ea97705eee929964d9b775519d5de735e490a0d4 [formerly b8df043202]
Former-commit-id: 5a7fca6352
2013-12-06 17:07:16 -06:00
Lee Venable
0d399cc52a Issue #2483 - Fixed image memory leak.
Former-commit-id: 1a52e2b388 [formerly 73caae724c] [formerly a2f75e547d] [formerly 3d6547d644 [formerly a2f75e547d [formerly b590a1d5799a94068fe9e444e40bb3819d596071]]]
Former-commit-id: 3d6547d644
Former-commit-id: 3d39b70d995dcfb7c2529bb9b72c3ce4df1b010c [formerly 74603afd97]
Former-commit-id: 25c7bd679f
2013-10-23 08:26:49 -05:00
Matt Nash
b0a0086da1 Issue #1476 make fix for collaboration for issues with closing of views when detached
Change-Id: Id35df245089ae352b5023ad2d31d1519379f8293

Former-commit-id: 999413b2e7 [formerly 311ac710ca] [formerly fdc6db0a50] [formerly 1d25736871 [formerly fdc6db0a50 [formerly 42a3798a2fcee3c383814b92c9010f77eb7b242a]]]
Former-commit-id: 1d25736871
Former-commit-id: 04b14b2dd0b28e80f7bd47e6d8aa7a5e1bb12a5f [formerly 274becd212]
Former-commit-id: 739a4ac2db
2013-03-04 09:41:11 -06:00
Steve Harris
fe763963e9 13.1.2-6 baseline
Former-commit-id: 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57]
Former-commit-id: 82a1ed77a4
2013-01-06 14:55:11 -06:00
Steve Harris
82cdde8491 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]
Former-commit-id: cd4185ef5c
2013-01-06 14:32:24 -06:00
Steve Harris
c9b563338a 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]
Former-commit-id: 2c82d9cb07
2012-10-16 13:27:07 -05:00